path: root/git-gui/lib/win32.tcl
diff options
authorJunio C Hamano <>2010-08-02 16:28:30 (GMT)
committerJunio C Hamano <>2010-08-02 16:28:30 (GMT)
commitc01a29c74ff991faf3012882fbf676b182b8893f (patch)
treeaea256176929d2bc66f77fde7dad2f7d7298154e /git-gui/lib/win32.tcl
parentac2e1e632e50c682305fee902b32b1a23ce71546 (diff)
parent2810a58dba6d06f4d1816fb06500c117feebd830 (diff)
Merge git:// into pt/git-gui
* git:// git-gui: fix size and position of window panes on startup git-gui: mc cannot be used before msgcat has been loaded git-gui: use textconv filter for diff and blame git-gui: Avoid using the <<Copy>> binding as a menu accelerator on win32 git-gui: fix shortcut creation on cygwin git-gui: fix PATH environment for mingw development environment git-gui: fix usage of _gitworktree when creating shortcut for windows git-gui: fix "Explore Working Copy" for Windows again git-gui: fix usage of themed widgets variable git-gui: Handle failure of core.worktree to identify the working directory. git-gui: check whether systems nice command works or disable it
Diffstat (limited to 'git-gui/lib/win32.tcl')
1 files changed, 2 insertions, 2 deletions
diff --git a/git-gui/lib/win32.tcl b/git-gui/lib/win32.tcl
index d7f93d0..db91ab8 100644
--- a/git-gui/lib/win32.tcl
+++ b/git-gui/lib/win32.tcl
@@ -18,9 +18,9 @@ proc win32_create_lnk {lnk_path lnk_exec lnk_dir} {
eval [list exec wscript.exe \
/E:jscript \
/nologo \
- [file join $oguilib win32_shortcut.js] \
+ [file nativename [file join $oguilib win32_shortcut.js]] \
$lnk_path \
- [file join $oguilib git-gui.ico] \
+ [file nativename [file join $oguilib git-gui.ico]] \
$lnk_dir \
$lnk_exec] $lnk_args