Skip to content

Commit

Permalink
Merge branch 'master' into new
Browse files Browse the repository at this point in the history
  • Loading branch information
Paul Mackerras committed Apr 23, 2006
2 parents a8aaf19 + 61e56c8 commit f3a2469
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions gitk
Original file line number Diff line number Diff line change
Expand Up @@ -1361,11 +1361,12 @@ proc layoutrows {row endrow last} {

proc addextraid {id row} {
global displayorder commitrow commitinfo
global commitidx
global commitidx commitlisted
global parentlist childlist children

incr commitidx
lappend displayorder $id
lappend commitlisted 0
lappend parentlist {}
set commitrow($id) $row
readcommit $id
Expand Down Expand Up @@ -1770,7 +1771,7 @@ proc drawcmittext {id row col rmx} {
proc drawcmitrow {row} {
global displayorder rowidlist
global idrangedrawn iddrawn
global commitinfo commitlisted parentlist numcommits
global commitinfo parentlist numcommits

if {$row >= $numcommits} return
foreach id [lindex $rowidlist $row] {
Expand Down

0 comments on commit f3a2469

Please sign in to comment.