Merge branch 'master' into httptests

2017-08-18 04:33:21 +01:00 · 2017-08-18 04:33:21 +01:00 · e2ca5853fc
parent ea53cb0dfa 2df4c1bb91
commit e2ca5853fc
7 changed files with 1 additions and 1 deletions
--- a/OpenSim/Framework/VersionInfo.cs
+++ b/OpenSim/Framework/VersionInfo.cs
@ -32,7 +32,7 @@ namespace OpenSim
        public const string VersionNumber = "0.9.1.0";
        public const string AssemblyVersionNumber = "0.9.1.*";

-        private const Flavour VERSION_FLAVOUR = Flavour.Dev;
+        public const Flavour VERSION_FLAVOUR = Flavour.Dev;

        public enum Flavour
        {
--- a/bin/OpenMetaverse.Rendering.Meshmerizer.dll
+++ b/bin/OpenMetaverse.Rendering.Meshmerizer.dll
--- a/bin/OpenMetaverse.StructuredData.dll
+++ b/bin/OpenMetaverse.StructuredData.dll
--- a/bin/OpenMetaverse.dll
+++ b/bin/OpenMetaverse.dll
--- a/bin/OpenMetaverseTypes.dll
+++ b/bin/OpenMetaverseTypes.dll
--- a/bin/lib32/libBulletSim.dylib
+++ b/bin/lib32/libBulletSim.dylib
--- a/bin/lib64/libBulletSim.dylib
+++ b/bin/lib64/libBulletSim.dylib