Merge git://git.kernel.org/pub/scm/gitk/gitk
authorJunio C Hamano <gitster@pobox.com>
Fri, 29 Jan 2010 20:57:44 +0000 (12:57 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 29 Jan 2010 20:57:44 +0000 (12:57 -0800)
* git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Update German translation
  gitk: Add French translation
  gitk: update Italian translation
  gitk: Update Swedish translation
  gitk: Adjust two equal strings which differed in whitespace
  gitk: Display submodule diffs with appropriate encoding
  gitk: Fix display of newly-created tags
  gitk: Enable gitk to create tags with messages
  gitk: Update Hungarian translation
  gitk: Add Hungarian translation
  gitk: Add "--no-replace-objects" option

1  2 
gitk-git/gitk
gitk-git/po/de.po
gitk-git/po/fr.po
gitk-git/po/hu.po
gitk-git/po/it.po
gitk-git/po/sv.po

diff --cc gitk-git/gitk
index 364c7a84cbcf923deb72c2a91b4ec5f5d75bf4c3,48cfce3a0e7cbe0148a4db3776008945e4b064b9..48cfce3a0e7cbe0148a4db3776008945e4b064b9
mode 100644,100755..100644
--- 2/gitk
Simple merge
index 0000000000000000000000000000000000000000,cb0e1edc634d29f3ddf83ae39c4f9c75d7374326..cb0e1edc634d29f3ddf83ae39c4f9c75d7374326
mode 000000,100644..100644
--- /dev/null
index 0000000000000000000000000000000000000000,1df212e8817258da3bf870997e42e75fad09fe95..1df212e8817258da3bf870997e42e75fad09fe95
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge