Merge branch 'master' into release-0.17.0

62c8ed73 · Jussi Lindgren · 59325d61 · ea261ae5 · 62c8ed73
Commit 62c8ed73 authored Dec 19, 2013 by Jussi Lindgren
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

win32-openvibe-x.x.x-setup.nsi scripts/win32-openvibe-x.x.x-setup.nsi +2 -1

No files found.
--- a/scripts/win32-openvibe-x.x.x-setup.nsi
+++ b/scripts/win32-openvibe-x.x.x-setup.nsi
@@ -157,7 +157,8 @@ no_need_to_install_directx:
 no_need_to_patch_3d_functionnality:

 	; Overwrite the file that may be in share/, as it contains local definitions to the build machine
-	FileOpen $0 "$INSTDIR\bin\openvibe-set-env.cmd" w	FileWrite $0 "@echo off$\r$\n"
+	FileOpen $0 "$INSTDIR\bin\openvibe-set-env.cmd" w
+	FileWrite $0 "@echo off$\r$\n"
 	FileWrite $0 "$\r$\n"

 	FileWrite $0 "$\r$\n"