diff options
author | root | 2009-11-26 20:41:38 +0100 |
---|---|---|
committer | root | 2009-11-26 20:41:38 +0100 |
commit | 2c3f6aaa878b5458eeeab8544226ff53b7172f5a (patch) | |
tree | 48941505962693508016fafb479c2baaf1b3568f /OpenSim/Framework/Servers | |
parent | First attempt at mult-sit on large single prims. (diff) | |
parent | Remove OS version crap from about dialog (diff) | |
download | opensim-SC-2c3f6aaa878b5458eeeab8544226ff53b7172f5a.zip opensim-SC-2c3f6aaa878b5458eeeab8544226ff53b7172f5a.tar.gz opensim-SC-2c3f6aaa878b5458eeeab8544226ff53b7172f5a.tar.bz2 opensim-SC-2c3f6aaa878b5458eeeab8544226ff53b7172f5a.tar.xz |
Merge branch 'careminster' into tests
Diffstat (limited to 'OpenSim/Framework/Servers')
-rw-r--r-- | OpenSim/Framework/Servers/VersionInfo.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/VersionInfo.cs b/OpenSim/Framework/Servers/VersionInfo.cs index 9f98310..0d4215b 100644 --- a/OpenSim/Framework/Servers/VersionInfo.cs +++ b/OpenSim/Framework/Servers/VersionInfo.cs | |||
@@ -29,7 +29,7 @@ namespace OpenSim | |||
29 | { | 29 | { |
30 | public class VersionInfo | 30 | public class VersionInfo |
31 | { | 31 | { |
32 | private const string VERSION_NUMBER = "0.6.8"; | 32 | private const string VERSION_NUMBER = "0.6.9-CM"; |
33 | private const Flavour VERSION_FLAVOUR = Flavour.Dev; | 33 | private const Flavour VERSION_FLAVOUR = Flavour.Dev; |
34 | 34 | ||
35 | public enum Flavour | 35 | public enum Flavour |