From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 27 Oct 2009 21:55:37 +0000 (-0700)
Subject: Merge git://repo.or.cz/git-gui
X-Git-Tag: v1.6.6-rc0~96
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4096958aab6f83302dd00f19d2bd500ae75e8c29;p=thirdparty%2Fgit.git

Merge git://repo.or.cz/git-gui

* git://repo.or.cz/git-gui:
  git-gui: adjust the minimum height of diff pane for shorter screen height
  git-gui: fix use of uninitialized variable
  git-gui: store wm state and fix wm geometry
  git-gui: Ensure submodule path is quoted properly
  git-gui: fix diff for partially staged submodule changes
  git-gui: Update russian translation
  git-gui: Limit display to a maximum number of files
  git-gui: remove warning when deleting correctly merged remote branch
  git-gui: Added Greek translation & glossary
  git-gui: display summary when showing diff of a submodule
---

4096958aab6f83302dd00f19d2bd500ae75e8c29
diff --cc git-gui/po/el.po
index 0000000000,3634ba469d..3634ba469d
mode 000000,100644..100644
--- a/git-gui/po/el.po
+++ b/git-gui/po/el.po
diff --cc git-gui/po/glossary/el.po
index 0000000000,1d3cc818d5..1d3cc818d5
mode 000000,100644..100644
--- a/git-gui/po/glossary/el.po
+++ b/git-gui/po/glossary/el.po