![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Shawn O. Pearce <spearce@spearce.org> | |
| Sun, 21 Oct 2007 03:41:20 +0000 (23:41 -0400) | ||
| committer | Shawn O. Pearce <spearce@spearce.org> | |
| Sun, 21 Oct 2007 03:41:20 +0000 (23:41 -0400) | ||
| commit | 6e863d6d129a1b6a13c66d0bb03f3d43db6c51fe | |
| tree | 78bf6c66129ae7a153c3b012adc945c5f07f3d4e | tree | snapshot |
| parent | 43db492a8eb701dd157f88ae9ca38d366c280761 | commit | diff |
| parent | e5ef6f952a13342065d44bab53999e8d8529cc3b | commit | diff |
Merge git://git.kernel.org/pub/scm/gitk/gitk
* 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
* 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