Merge branch 'master' into vehicles

1 files changed, 2 insertions, 2 deletions

diff --git a/OpenSim/Framework/Servers/VersionInfo.cs b/OpenSim/Framework/Servers/VersionInfo.cs
index 62e7e92..9f98310 100644
--- a/OpenSim/Framework/Servers/VersionInfo.cs
+++ b/OpenSim/Framework/Servers/VersionInfo.cs
@@ -29,8 +29,8 @@ namespace OpenSim
 {
     public class VersionInfo
     {
-        private const string VERSION_NUMBER = "0.6.7";
-        private const Flavour VERSION_FLAVOUR = Flavour.RC1;
+        private const string VERSION_NUMBER = "0.6.8";
+        private const Flavour VERSION_FLAVOUR = Flavour.Dev;
 
         public enum Flavour
         {