Merge git://git.kernel.org/pub/scm/gitk/gitk
authorJunio C Hamano <junkio@cox.net>
Sun, 13 Aug 2006 01:32:17 +0000 (18:32 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 13 Aug 2006 01:32:17 +0000 (18:32 -0700)
* git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Show the currently checked-out head in bold font
  gitk: Allow the user to set some colors

1  2 
gitk

diff --cc gitk
Simple merge