diff options
author | Melanie | 2010-06-12 02:46:11 +0100 |
---|---|---|
committer | Melanie | 2010-06-12 02:46:11 +0100 |
commit | 3c3ad0886830dce3ebbc291b694086e4b02bd9b6 (patch) | |
tree | e3b54a5102c9c1326c129a691699ea1bc5c60d02 | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
parent | Change trunk versio to 0.7.1 Dev (diff) | |
download | opensim-SC_OLD-3c3ad0886830dce3ebbc291b694086e4b02bd9b6.zip opensim-SC_OLD-3c3ad0886830dce3ebbc291b694086e4b02bd9b6.tar.gz opensim-SC_OLD-3c3ad0886830dce3ebbc291b694086e4b02bd9b6.tar.bz2 opensim-SC_OLD-3c3ad0886830dce3ebbc291b694086e4b02bd9b6.tar.xz |
Merge branch 'master' into careminster-presence-refactor
0.7.1CM Dev
-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 518f2ea..f3ac191 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.7CM"; | 32 | private const string VERSION_NUMBER = "0.7.1CM"; |
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 |