Merge branch 'master' into careminster

author: Melanie 2011-12-28 09:24:35 +0000
committer: Melanie 2011-12-28 09:24:35 +0000
commit: bde004c08edbe1e0209fe348d7464ea3dab7f657 (patch)
tree: e653ee608b265a19687e49f267e0df030d68848d /Prebuild/scripts/SharpDevelop2.bat
parent: Fix permissions being lost and correct slam behavior, removing icompatible (diff)
parent: Introduce a LightShare kill packet ans send it when needed. Currently only (diff)
download: opensim-SC_OLD-bde004c08edbe1e0209fe348d7464ea3dab7f657.zip
opensim-SC_OLD-bde004c08edbe1e0209fe348d7464ea3dab7f657.tar.gz
opensim-SC_OLD-bde004c08edbe1e0209fe348d7464ea3dab7f657.tar.bz2
opensim-SC_OLD-bde004c08edbe1e0209fe348d7464ea3dab7f657.tar.xz
1 files changed, 4 insertions, 4 deletions
diff --git a/Prebuild/scripts/SharpDevelop2.bat b/Prebuild/scripts/SharpDevelop2.bat
index 49120ab..4ca0272 100755
--- a/Prebuild/scripts/SharpDevelop2.bat
+++ b/Prebuild/scripts/SharpDevelop2.bat
@@ -1,4 +1,4 @@
-@rem Generates a combine (.cmbx) and a set of project files (.prjx) 
+@rem Generates a combine (.cmbx) and a set of project files (.prjx) 
-@rem for SharpDevelop (http://icsharpcode.net/OpenSource/SD/Default.aspx)
+@rem for SharpDevelop (http://icsharpcode.net/OpenSource/SD/Default.aspx)
-cd ..
+cd ..
-Prebuild.exe /target sharpdev2 /file prebuild.xml /pause
+Prebuild.exe /target sharpdev2 /file prebuild.xml /pause
author	Melanie	2011-12-28 09:24:35 +0000
committer	Melanie	2011-12-28 09:24:35 +0000
commit	bde004c08edbe1e0209fe348d7464ea3dab7f657 (patch)
tree	e653ee608b265a19687e49f267e0df030d68848d /Prebuild/scripts/SharpDevelop2.bat
parent	Fix permissions being lost and correct slam behavior, removing icompatible (diff)
parent	Introduce a LightShare kill packet ans send it when needed. Currently only (diff)
download	opensim-SC_OLD-bde004c08edbe1e0209fe348d7464ea3dab7f657.zip opensim-SC_OLD-bde004c08edbe1e0209fe348d7464ea3dab7f657.tar.gz opensim-SC_OLD-bde004c08edbe1e0209fe348d7464ea3dab7f657.tar.bz2 opensim-SC_OLD-bde004c08edbe1e0209fe348d7464ea3dab7f657.tar.xz

diff --git a/Prebuild/scripts/SharpDevelop2.bat b/Prebuild/scripts/SharpDevelop2.bat index 49120ab..4ca0272 100755 --- a/Prebuild/scripts/SharpDevelop2.bat +++ b/Prebuild/scripts/SharpDevelop2.bat
@@ -1,4 +1,4 @@
1	@rem Generates a combine (.cmbx) and a set of project files (.prjx)	1	@rem Generates a combine (.cmbx) and a set of project files (.prjx)
2	@rem for SharpDevelop (http://icsharpcode.net/OpenSource/SD/Default.aspx)	2	@rem for SharpDevelop (http://icsharpcode.net/OpenSource/SD/Default.aspx)
3	cd ..	3	cd ..
4	Prebuild.exe /target sharpdev2 /file prebuild.xml /pause	4	Prebuild.exe /target sharpdev2 /file prebuild.xml /pause