]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge git://git.kernel.org/pub/scm/gitk/gitk
authorJunio C Hamano <gitster@pobox.com>
Wed, 6 Aug 2008 20:32:12 +0000 (13:32 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 Aug 2008 20:32:12 +0000 (13:32 -0700)
* git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Update swedish translation.
  gitk: Updated German translation
  gitk: Fallback to selecting the head commit upon load
  gitk: Fixed automatic row selection during load
  gitk: Fixed broken exception handling in diff
  gitk: On Windows, use a Cygwin-specific flag for kill
  gitk: Arrange to kill diff-files & diff-index on quit
  gitk: Kill back-end processes on window close

1  2 
gitk-git/gitk
gitk-git/po/de.po
gitk-git/po/sv.po

diff --cc gitk-git/gitk
index fddcb45817ed6839ba95965d7e57e9a2e04ae30a,d093a39506798c750cc838f0085f6721e0f733a9..d093a39506798c750cc838f0085f6721e0f733a9
mode 100644,100755..100644
--- 2/gitk
Simple merge
Simple merge