Merge git://git.kernel.org/pub/scm/gitk/gitk
authorJunio C Hamano <gitster@pobox.com>
Mon, 21 Sep 2009 06:47:52 +0000 (23:47 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 21 Sep 2009 06:47:52 +0000 (23:47 -0700)
* git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Work around leftover temporary save file
  gitk: Show diff of commits at end of compare-commits output
  gitk: Update Swedish translation (280t0f0u)

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

diff --cc gitk-git/gitk
index 8c08310,a0214b7..a0214b7
mode 100644,100755..100644
--- 2/gitk
Simple merge