Merge git://git.kernel.org/pub/scm/gitk/gitk
authorJunio C Hamano <gitster@pobox.com>
Wed, 13 Feb 2008 19:03:49 +0000 (11:03 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 13 Feb 2008 19:03:49 +0000 (11:03 -0800)
* git://git.kernel.org/pub/scm/gitk/gitk:
  [PATCH] gitk: learn --show-all output
  [PATCH] gitk: properly deal with tag names containing / (slash)
  [PATCH] gitk: Add checkbutton to ignore space changes
  [PATCH] gitk: Fix "Key bindings" message

1  2 
gitk-git/gitk

diff --cc gitk-git/gitk
index 5560e4dc560587c4a551c24a1ee59df394726fc9,25ab725bba48e62f34f8a2fab56eda82fc77be48..25ab725bba48e62f34f8a2fab56eda82fc77be48
mode 100644,100755..100644
--- 2/gitk