Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Helpers.cs
	prebuild.xml

5 files changed, 8 insertions, 4 deletions

diff --git a/bin/RegionConfig.ini.example b/bin/Regions/Regions.ini.example
index ff00ddf..54a841d 100644
--- a/bin/RegionConfig.ini.example
+++ b/bin/Regions/Regions.ini.example
@@ -1,7 +1,11 @@
-; * This file must be renamed to RegionConfig.ini and moved to the Regions/
-; * subdirectory to work!
-; *
-; * You can put multiple regions into one file or make one file per region
+; * This is an example region config file.
+; * 
+; * If OpenSimulator is started up without any regions, it will ask you configuration questions to generate a Regions.ini file for you.
+; * So there is no need to change this file directly, it is only for reference.
+; * However, if you prefer you can also copy this file to Regions.ini and appropriately change the parameters below.
+; * Only files ending with .ini and .xml in this directly will be loaded by OpenSimulator.
+; *
+; * You can multiple regions into one file or make one file per region
 ; * The section name is the region name
 ; *
 
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index a3ccb98..8791ba5 100755
--- a/bin/lib32/BulletSim.dll
+++ b/bin/lib32/BulletSim.dll
diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so
index 0b286aa..da98509 100755
--- a/bin/lib32/libBulletSim.so
+++ b/bin/lib32/libBulletSim.so
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll
index d91dac1..9af5dab 100755
--- a/bin/lib64/BulletSim.dll
+++ b/bin/lib64/BulletSim.dll
diff --git a/bin/lib64/libBulletSim.so b/bin/lib64/libBulletSim.so
index 891c956..3d4b630 100755
--- a/bin/lib64/libBulletSim.so
+++ b/bin/lib64/libBulletSim.so