Merge branch 'tests' of kitto@tor.k-grid.com:/home/kitto/opensim into careminster

1 files changed, 4 insertions, 4 deletions

diff --git a/OpenSim/Framework/Servers/VersionInfo.cs b/OpenSim/Framework/Servers/VersionInfo.cs
index 0d4215b..f5be1e6 100644
--- a/OpenSim/Framework/Servers/VersionInfo.cs
+++ b/OpenSim/Framework/Servers/VersionInfo.cs
@@ -29,9 +29,8 @@ namespace OpenSim
 {
     public class VersionInfo
     {
-        private const string VERSION_NUMBER = "0.6.9-CM";
-        private const Flavour VERSION_FLAVOUR = Flavour.Dev;
-
+        private const string VERSION_NUMBER = "112609s";
+        private const Flavour VERSION_FLAVOUR = Flavour.BetaM7;
         public enum Flavour
         {
             Unknown,
@@ -39,7 +38,8 @@ namespace OpenSim
             RC1,
             RC2,
             Release,
-            Post_Fixes
+            Post_Fixes,
+            BetaM7            
         }
 
         public static string Version