Mercurial > hg > easyhg
diff hgrunner.cpp @ 336:4229b6a8e9c6
Merge
author | Chris Cannam |
---|---|
date | Mon, 14 Mar 2011 10:00:29 +0000 |
parents | dff8ec43c86d |
children | bb189827f6d1 |
line wrap: on
line diff
--- a/hgrunner.cpp Wed Mar 02 15:58:34 2011 +0000 +++ b/hgrunner.cpp Mon Mar 14 10:00:29 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