Mercurial > hg > easyhg

changeset 492:88c29b718702

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Chris Cannam
date Thu, 18 Aug 2011 13:15:58 +0100
parents 1d90cd7a1c5f (current diff) cd3dd285d0ff (diff)
children 75ebcacd3f75 eea753f1cae8
files
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/deploy/osx/deploy.sh	Thu Aug 18 13:15:38 2011 +0100
+++ b/deploy/osx/deploy.sh	Thu Aug 18 13:15:58 2011 +0100
@@ -30,7 +30,7 @@
 mkdir "$volume" || exit 1
 
 ln -s /Applications "$volume"/Applications
-cp -rp "$source" "$target"
+cp -RPp "$source" "$target"
 
 echo "Done"
 
--- a/src/hgrunner.cpp	Thu Aug 18 13:15:38 2011 +0100
+++ b/src/hgrunner.cpp	Thu Aug 18 13:15:58 2011 +0100
@@ -543,7 +543,7 @@
 #endif
 
 #ifdef Q_OS_MAC
-    if (settings.value("python32", false).toBool()) {
+    if (QSettings().value("python32", false).toBool()) {
         env.insert("VERSIONER_PYTHON_PREFER_32_BIT", "1");
     }
 #endif