Steffen Prohaska 7c2ca98651 gitk: Fix wrong merge ...

This fixes the wrong conflict resolution of merge
5673e9999d

2008-08-16 16:14:40 +02:00

..

po

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

2008-08-06 13:32:12 -07:00

gitk

gitk: Fix wrong merge

2008-08-16 16:14:40 +02:00

Makefile

Merge branch 'master' of git://repo.or.cz/alt-git

2008-05-20 21:50:02 +02:00