Merge master.kernel.org:/pub/scm/gitk/gitk
authorLinus Torvalds <torvalds@evo.osdl.org>
Mon, 18 Jul 2005 23:26:00 +0000 (19:26 -0400)
committerLinus Torvalds <torvalds@evo.osdl.org>
Mon, 18 Jul 2005 23:26:00 +0000 (19:26 -0400)
1  2 
gitk

diff --cc gitk
Simple merge