From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 1 May 2009 02:56:28 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/gitk/gitk
X-Git-Tag: v1.6.3-rc4~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=75b44066f3ed7cde238cdea1f0bf9e2f1744c820;p=git

Merge git://git.kernel.org/pub/scm/gitk/gitk

* git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Add Russian translation
  gitk: Fix compare-commits function when we have local changes
  gitk: Avoid crash if closed while reading references
  gitk: Handle external diff tool with spaces in the path
  gitk: Remember and restore the window state with the geometry
  gitk: Map KP_Divide to focus the search box
  gitk: Mark some more strings for translation
  gitk: Mark forgotten string for translation
  gitk: Make .gitk a hidden file under windows
  gitk: Add a command to compare two strings of commits
  gitk: Add a way to mark a commit, plus a "find descendant" command
  gitk: Fixes for Mac OS X TkAqua
  gitk: Provide a 32x32 window icon based on the git logo
  gitk: Provide a window icon if possible
  gitk: Handle blobs containing a DOS end-of-file marker
---

75b44066f3ed7cde238cdea1f0bf9e2f1744c820
diff --cc gitk-git/gitk
index 1773ae63eb,1a7887b252..1a7887b252
mode 100644,100755..100644
--- a/gitk-git/gitk
+++ b/gitk-git/gitk
diff --cc gitk-git/po/ru.po
index 0000000000,704eba8f9d..704eba8f9d
mode 000000,100644..100644
--- a/gitk-git/po/ru.po
+++ b/gitk-git/po/ru.po