git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 182fb4d a977953)
Merge git://git.kernel.org/pub/scm/gitk/gitk
authorJunio C Hamano <redacted>
Sat, 24 May 2008 01:28:52 +0000 (18:28 -0700)
committerJunio C Hamano <redacted>
Sat, 24 May 2008 01:28:52 +0000 (18:28 -0700)
* 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

1  2 
gitk-git/gitk patch | diff1 | diff2 | blob | history
gitk-git/po/es.po patch | diff1 | diff2 | blob | history

diff --cc gitk-git/gitk
index 9ab6dbaa460cc4c63398e836506c204d382419b4,22bcd18a4671b3bdd78f065c65bdaf042ba4a77e..22bcd18a4671b3bdd78f065c65bdaf042ba4a77e
mode 100644,100755..100644
--- 1/gitk-git/gitk
--- 2/gitk
+++ b/gitk-git/gitk
diff --cc gitk-git/po/es.po
Simple merge
git clone https://git.99rst.org/PROJECT