From: Paul Mackerras <paulus@samba.org>
Date: Sun, 23 Apr 2006 12:47:07 +0000 (+1000)
Subject: Merge branch 'master' into new
X-Git-Tag: v1.4.0-rc1~21^2~11^2~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f3a2469b2583a88b84d12b1e819a177cf7d7670f;p=git.git

Merge branch 'master' into new
---

f3a2469b2583a88b84d12b1e819a177cf7d7670f
diff --cc gitk
index 6cefc8721,5362b76be..4ee51223b
--- a/gitk
+++ b/gitk
@@@ -1769,8 -1484,8 +1770,8 @@@ proc drawcmittext {id row col rmx} 
  
  proc drawcmitrow {row} {
      global displayorder rowidlist
 -    global idrowranges idrangedrawn iddrawn
 +    global idrangedrawn iddrawn
-     global commitinfo commitlisted parentlist numcommits
+     global commitinfo parentlist numcommits
  
      if {$row >= $numcommits} return
      foreach id [lindex $rowidlist $row] {