aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers
diff options
context:
space:
mode:
authorMelanie2010-04-13 04:36:08 +0100
committerMelanie2010-04-13 04:36:08 +0100
commit9920e219dd4a98d1ac62bfa4aa4679d50aa32b8f (patch)
tree0b57576deba41ef22c8fc0b29e6f2b92557fe3b0 /OpenSim/Framework/Servers
parentMerge branch 'careminster' into careminster-presence-refactor (diff)
parentMerge branch '0.6.9-post-fixes' into careminster (diff)
downloadopensim-SC-9920e219dd4a98d1ac62bfa4aa4679d50aa32b8f.zip
opensim-SC-9920e219dd4a98d1ac62bfa4aa4679d50aa32b8f.tar.gz
opensim-SC-9920e219dd4a98d1ac62bfa4aa4679d50aa32b8f.tar.bz2
opensim-SC-9920e219dd4a98d1ac62bfa4aa4679d50aa32b8f.tar.xz
Merge branch 'careminster' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Framework/Servers')
-rw-r--r--OpenSim/Framework/Servers/VersionInfo.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/VersionInfo.cs b/OpenSim/Framework/Servers/VersionInfo.cs
index e7fb9df..518f2ea 100644
--- a/OpenSim/Framework/Servers/VersionInfo.cs
+++ b/OpenSim/Framework/Servers/VersionInfo.cs
@@ -33,7 +33,7 @@ namespace OpenSim
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
36 { 36 {
37 Unknown, 37 Unknown,
38 Dev, 38 Dev,
39 RC1, 39 RC1,