diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-09-15 12:34:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-15 12:34:48 -0700 |
| commit | 12644fa99fd16c33379c885670be0963cec07fc1 (patch) | |
| tree | dcc24e83797accfe0f781011af4c318f7c855743 /git-gui/Makefile | |
| parent | 5879b6bbcaba7696e4abfa717748da166f915405 (diff) | |
| parent | 00e9de72c8f9b7c048bb56a59be9567d69dc1e01 (diff) | |
| download | git-12644fa99fd16c33379c885670be0963cec07fc1.tar.gz | |
Merge git://repo.or.cz/git-gui
* 'master' of git://repo.or.cz/git-gui:
git-gui 0.13
git-gui: avoid mis-encoding the copyright message on Windows.
git-gui: Update Swedish translation (521t).
git-gui: ensure correct application termination in git-gui--askpass
git-gui: handle textconv filter on Windows and in development
git-gui: use shell to launch textconv filter in "blame"
git-gui: display error launching blame as a message box.
git-gui: Make usage statement visible on Windows.
Diffstat (limited to 'git-gui/Makefile')
| -rw-r--r-- | git-gui/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/git-gui/Makefile b/git-gui/Makefile index 197b55edf3..e22ba5c321 100644 --- a/git-gui/Makefile +++ b/git-gui/Makefile @@ -215,6 +215,7 @@ endif $(GITGUI_MAIN): git-gui.sh GIT-VERSION-FILE GIT-GUI-VARS $(QUIET_GEN)rm -f $@ $@+ && \ sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ + -e 's|@@SHELL_PATH@@|$(SHELL_PATH_SQ)|' \ -e '1,30s|^ argv0=$$0| argv0=$(GITGUI_SCRIPT)|' \ -e '1,30s|^ exec wish | exec '\''$(TCLTK_PATH_SED)'\'' |' \ -e 's/@@GITGUI_VERSION@@/$(GITGUI_VERSION)/g' \ |