aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMelanie2010-04-05 18:22:15 +0100
committerMelanie2010-04-05 18:22:15 +0100
commitba31b31ed08427f359f2ec54caf0f4e43f8c9b3d (patch)
treef2aadaca30ea0e286b524dbb2fa6d2a88423d873 /OpenSim/Framework
parentMerge branch 'master' into careminster-presence-refactor (diff)
parentMerge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... (diff)
downloadopensim-SC_OLD-ba31b31ed08427f359f2ec54caf0f4e43f8c9b3d.zip
opensim-SC_OLD-ba31b31ed08427f359f2ec54caf0f4e43f8c9b3d.tar.gz
opensim-SC_OLD-ba31b31ed08427f359f2ec54caf0f4e43f8c9b3d.tar.bz2
opensim-SC_OLD-ba31b31ed08427f359f2ec54caf0f4e43f8c9b3d.tar.xz
Merge branch 'careminster' into careminster-presence-refactor
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Servers/VersionInfo.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Framework/Servers/VersionInfo.cs b/OpenSim/Framework/Servers/VersionInfo.cs
index cd2f384..e7fb9df 100644
--- a/OpenSim/Framework/Servers/VersionInfo.cs
+++ b/OpenSim/Framework/Servers/VersionInfo.cs
@@ -31,6 +31,7 @@ namespace OpenSim
31 { 31 {
32 private const string VERSION_NUMBER = "0.7CM"; 32 private const string VERSION_NUMBER = "0.7CM";
33 private const Flavour VERSION_FLAVOUR = Flavour.Dev; 33 private const Flavour VERSION_FLAVOUR = Flavour.Dev;
34
34 public enum Flavour 35 public enum Flavour
35 { 36 {
36 Unknown, 37 Unknown,