Merge branch 'stable-2.10'

* stable-2.10:
  Set 'line-height: normal' for lines in side-by-side diff
  Add missing documentation of the groups_members cache
  SideBySide2: Show file name in window title again
  Fix documentation of the default value for core.streamFileThreshold
  Bump version to 2.9.2

Change-Id: Ibea6f3291015f1dc707057537916e00d5a93c501
This commit is contained in:
David Pursehouse
2014-11-19 19:15:10 +09:00
3 changed files with 8 additions and 2 deletions

View File

@@ -44,6 +44,7 @@ limitations under the License.
overflow: hidden;
border-right: 0;
width: auto;
line-height: normal;
}
/* Preserve space for underscores. If this changes

View File

@@ -162,6 +162,7 @@ public class SideBySide2 extends Screen {
protected void onInitUI() {
super.onInitUI();
setHeaderVisible(false);
setWindowTitle(FileInfo.getFileName(path));
}
@Override