[SCM] python-pyo/master: Fixing conflitcs. wtf

[tiago at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit fa657976b2519aeabae26e9c9ffba33b0144ab78
Author: Tiago Bortoletto Vaz <tiago at debian.org>
Date:   Tue Jul 28 17:41:21 2015 -0400

    Fixing conflitcs. wtf

diff --git a/installers/win/build_installers_win.bat b/installers/win/build_installers_win.bat
index cc60331..0861ba3 100644
--- a/installers/win/build_installers_win.bat
+++ b/installers/win/build_installers_win.bat
@@ -1,7 +1,7 @@
-echo off
-
-echo *** Build installer for python2.6 ***
-Compil32 /cc "win_installer_py26.iss"
-
-echo *** Build installer for python2.7 ***
-Compil32 /cc "win_installer_py27.iss"
+echo off
+
+echo *** Build installer for python2.6 ***
+Compil32 /cc "win_installer_py26.iss"
+
+echo *** Build installer for python2.7 ***
+Compil32 /cc "win_installer_py27.iss"
diff --git a/scripts/compile_win.bat b/scripts/compile_win.bat
index a78f5f7..39bde38 100644
--- a/scripts/compile_win.bat
+++ b/scripts/compile_win.bat
@@ -1,19 +1,19 @@
-echo off
-
-echo *** Compile for python2.6 ***
-C:\Python26\python.exe setup.py install --use-double
-
-RMDIR /S /Q build
-
-echo *** Compile for python2.7 ***
-C:\Python27\python.exe setup.py install --use-double
-
-RMDIR /S /Q build
-
-cd utils
-
-echo *** Build E-Pyo for python2.6 ***
-C:\Python26\python.exe epyo_builder_win32.py
-
-echo *** Build E-Pyo for python2.7 ***
-C:\Python27\python.exe epyo_builder_win32.py
+echo off
+
+echo *** Compile for python2.6 ***
+C:\Python26\python.exe setup.py install --use-double
+
+RMDIR /S /Q build
+
+echo *** Compile for python2.7 ***
+C:\Python27\python.exe setup.py install --use-double
+
+RMDIR /S /Q build
+
+cd utils
+
+echo *** Build E-Pyo for python2.6 ***
+C:\Python26\python.exe epyo_builder_win32.py
+
+echo *** Build E-Pyo for python2.7 ***
+C:\Python27\python.exe epyo_builder_win32.py

-- 
python-pyo packaging