From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 24 May 2008 01:28:52 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/gitk/gitk
X-Git-Tag: v1.5.6-rc0~20
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=998b912927281a871e8d379e2b3a4385c775c4fe;p=git.git

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

* git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Fix bug introduced by "gitk: Fix "wrong # coordinates" error on reload"
  gitk: Fix bug where current row number display stops working
  gitk: Move es.po where it belongs
  gitk: Fix "wrong # coordinates" error on reload
---

998b912927281a871e8d379e2b3a4385c775c4fe
diff --cc gitk-git/gitk
index 9ab6dbaa4,22bcd18a4..22bcd18a4
mode 100644,100755..100644
--- a/gitk-git/gitk
+++ b/gitk-git/gitk