Code

Merge git://git.kernel.org/pub/scm/gitk/gitk
authorShawn O. Pearce <spearce@spearce.org>
Sun, 21 Oct 2007 03:41:20 +0000 (23:41 -0400)
committerShawn O. Pearce <spearce@spearce.org>
Sun, 21 Oct 2007 03:41:20 +0000 (23:41 -0400)
* git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Fix "can't unset prevlines(...)" Tcl error
  gitk: Avoid an error when cherry-picking if HEAD has moved on
  gitk: Check that we are running on at least Tcl/Tk 8.4
  gitk: Do not pick up file names of "copy from" lines
  gitk: Add support for OS X mouse wheel
  gitk: disable colours when calling git log


Trivial merge