![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Shawn O. Pearce <spearce@spearce.org> | |
| Wed, 3 Oct 2007 04:17:19 +0000 (00:17 -0400) | ||
| committer | Shawn O. Pearce <spearce@spearce.org> | |
| Wed, 3 Oct 2007 04:17:19 +0000 (00:17 -0400) | ||
| commit | e73bfa7709b108575e6ea73d6e97fc3efd967b38 | |
| tree | 507b318fe2f1b74595541ee561c8976906d59b66 | tree | snapshot |
| parent | 0b2bc460fc69d2aa4f5af743b2b2317088e53949 | commit | diff |
| parent | 906ab7f6c03764423adef6c0e4d77442405adc23 | commit | diff |
Merge branch 'maint'
* maint:
git-gui: Don't crash when starting gitk from a browser session
git-gui: Allow gitk to be started on Cygwin with native Tcl/Tk
Conflicts:
git-gui.sh
* maint:
git-gui: Don't crash when starting gitk from a browser session
git-gui: Allow gitk to be started on Cygwin with native Tcl/Tk
Conflicts:
git-gui.sh
| git-gui.sh | diff1 | | diff2 | | blob | history |