diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-04-04 09:09:52 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-04 09:09:52 +0200 |
| commit | 80b6e39459e0d960292520d665c83d2dc32c3327 (patch) | |
| tree | de029fdb048d004819be7651081cb224e4aebcf4 /git-merge-resolve.sh | |
| parent | Merge branch 'post1.5.1/p4' (diff) | |
| parent | Optional Tck/Tk: ignore generated files. (diff) | |
| download | git-80b6e39459e0d960292520d665c83d2dc32c3327.tar.xz git-80b6e39459e0d960292520d665c83d2dc32c3327.zip | |
Merge branch 'post1.5.1/tcltk'
* post1.5.1/tcltk:
Optional Tck/Tk: ignore generated files.
Eliminate checks of user-specified Tcl/Tk interpreter.
Rewrite Tcl/Tk interpreter path for the GUI tools.
Add --with-tcltk and --without-tcltk to configure.
NO_TCLTK
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions