Merge from gitk
authorJunio C Hamano <junkio@cox.net>
Fri, 19 Aug 2005 23:15:59 +0000 (16:15 -0700)
committerJunio C Hamano <junkio@cox.net>
Fri, 19 Aug 2005 23:15:59 +0000 (16:15 -0700)
commitb30245c8e92ecaf8fb877189d7620a5a9a205120
treebca41846c4cedb36952e9965f9355a5ec59d61ab
parent7f1335c74c4ba0baac8649974e95f6e6f84f8632
parent106288cb023cff311ca499fe41b128afbdf82997
Merge from gitk