Merge git://git.kernel.org/pub/scm/gitk/gitk
commit998b912927281a871e8d379e2b3a4385c775c4fe
authorJunio C Hamano <gitster@pobox.com>
Sat, 24 May 2008 01:28:52 +0000 (23 18:28 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 24 May 2008 01:28:52 +0000 (23 18:28 -0700)
tree66d093ee0ada00ac61300c74d87d480b5b43cf42
parent182fb4df9120257c2e6b041dd58eef3de5b530d2
parenta977953326b5bc9556f2648a7327c623e676aaca
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
gitk-git/gitk
gitk-git/po/es.po