Merged remote changes. 5_1_x

Sat, 10 Dec 2011 14:01:44 +0100

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sat, 10 Dec 2011 14:01:44 +0100
branch
5_1_x
changeset 1484
ceb1e3cea618
parent 1483
d608d2d4086f (current diff)
parent 1480
d4e550958e3e (diff)
child 1485
b0d0ddac7012

Merged remote changes.

--- a/README-MacOSX.txt	Thu Dec 08 20:03:18 2011 +0100
+++ b/README-MacOSX.txt	Sat Dec 10 14:01:44 2011 +0100
@@ -87,7 +87,7 @@
 terminal window
 
 qmake qscintilla.pro -spec macx-g++
-make
+make -j
 sudo make install
 
 5. Install sip
@@ -101,7 +101,7 @@
 the extracted folder and enter these commands in a terminal window
 
 python3 configure.py
-make
+make -j
 sudo make install
 
 6. Install PyQt4
@@ -301,9 +301,10 @@
 
 sudo python3 setup.py install
 
-Note: You may receive some errors during the above steps. However, they just
-relate to the tests included in the packages. Nevertheless, the installation
-will be fine.
+Note: You may receive some errors during the above steps. They just relate to
+the tests included in the packages. If this occurs, please delete the faulty
+test file and retry. As of pylint 0.25.0 this file was 
+"test/input/func_unknown_encoding.py".
 
 17.2 Installation of cx_freeze
 ------------------------------

eric ide

mercurial