Merge branch 'maint-1.9' into maint-2.0

diff --git a/git-gui/macosx/Info.plist b/git-gui/macosx/Info.plist
index 99913ec57a346ad996fefa2d3f1f51be3265170b..1ade121c4cc532d565bdfc9f03a7e766963c34a8 100644 (file)
--- a/git-gui/macosx/Info.plist
+++ b/git-gui/macosx/Info.plist
@@ -5,7 +5,7 @@
        <key>CFBundleDevelopmentRegion</key>
        <string>English</string>
        <key>CFBundleExecutable</key>
-       <string>Wish</string>
+       <string>@@GITGUI_TKEXECUTABLE@@</string>
        <key>CFBundleGetInfoString</key>
        <string>Git Gui @@GITGUI_VERSION@@ © 2006-2007 Shawn Pearce, et. al.</string>
        <key>CFBundleIconFile</key>
@@ -24,5 +24,7 @@
        <string>GITg</string>
        <key>CFBundleVersion</key>
        <string>@@GITGUI_VERSION@@</string>
+       <key>NSHighResolutionCapable</key>
+       <true/>
 </dict>
 </plist>