From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 21 Oct 2008 05:16:09 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/gitk/gitk
X-Git-Tag: v1.6.1-rc1~123
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=35d2f73b999636c93049b2d7bed1458bcf2f9648;p=thirdparty%2Fgit.git

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

* git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Turn short SHA1 names into links too
  gitk: Regenerate .po files
  gitk: New way of constructing menus that allows for Alt+letter accelerators
  gitk: Bind Key-Return to create on new branch dialog
  gitk: Fix binding for <Return> in sha1 entry field
  gitk: Clean up file encoding code and add enable/disable option
  gitk: Implement batch lookup and caching of encoding attrs
  gitk: Enhance file encoding support
  gitk: Add untranslated error messages to translation
  gitk: Fix a bug in collapsing deeply nested trees
  gitk: Use <Button-2> for context menus on OSX
---

35d2f73b999636c93049b2d7bed1458bcf2f9648
diff --cc gitk-git/gitk
index 2eaa2ae7d6,bcebc87f7d..bcebc87f7d
mode 100644,100755..100644
--- a/gitk-git/gitk
+++ b/gitk-git/gitk