# HG changeset patch
# User Chris Cannam
# Date 1299866915 0
# Node ID ef977e7482cd9e339ee25c82e1a857dd457d9ca0
# Parent  913d213dd427805fe317b7168cced4c4426fbdec# Parent  ea62eb083ed41a86c531e33fc9b06b42b7986e97
Merge from branch "filelist_right_button_menu"

diff -r ea62eb083ed4 -r ef977e7482cd .hgtags
--- a/.hgtags	Fri Mar 11 18:08:22 2011 +0000
+++ b/.hgtags	Fri Mar 11 18:08:35 2011 +0000
@@ -6,3 +6,5 @@
 a7843b03b4cfa23f65adc693d6f82fdffc20f221 easyhg_v0.3.1
 cc95394e2392684217d6c19a12bd9bb56bf081a3 easyhg_v0.3.2
 4b9656471303408a2bd2b40656cd52a44305211d easyhg_v0.4
+4b9656471303408a2bd2b40656cd52a44305211d easyhg_v0.4
+124a3ea9fafb556cc47ec8f3d4cfdad3fd8596aa easyhg_v0.4
diff -r ea62eb083ed4 -r ef977e7482cd hgrunner.cpp
--- a/hgrunner.cpp	Fri Mar 11 18:08:22 2011 +0000
+++ b/hgrunner.cpp	Fri Mar 11 18:08:35 2011 +0000
@@ -423,9 +423,7 @@
 #endif
 
 #ifdef Q_OS_MAC
-    // On OS/X 10.6, Python is 64-bit by default but our Hg extension
-    // is only available in 32-bit
-    if (settings.value("python32", true).toBool()) {
+    if (settings.value("python32", false).toBool()) {
         env.insert("VERSIONER_PYTHON_PREFER_32_BIT", "1");
     }
 #endif
diff -r ea62eb083ed4 -r ef977e7482cd mainwindow.cpp
--- a/mainwindow.cpp	Fri Mar 11 18:08:22 2011 +0000
+++ b/mainwindow.cpp	Fri Mar 11 18:08:35 2011 +0000
@@ -1707,7 +1707,7 @@
     int n = extractChangeCount(output);
     if (n > 0) {
         head = tr("Pulled %n changeset(s)", "", n);
-        report = tr("The new changes will be highlighted in the history.<br>Use Update to bring these changes into your working copy.");
+        report = tr("New changes will be highlighted in yellow in the history.");
     } else if (n == 0) {
         head = tr("No changes to pull");
         report = tr("Your local repository already contains all changes found in the remote repository.");