aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMelanie2009-12-25 23:20:08 +0000
committerMelanie2009-12-25 23:20:08 +0000
commite881f35fbb64145fd4c3fd0cc786b7ad62fc191e (patch)
tree0999cb321359b4ef0122970fd7768b425adedc72 /OpenSim/Framework
parentMerge branch 'master' into careminster (diff)
parentRecover out-of-region objects during db load. (diff)
downloadopensim-SC_OLD-e881f35fbb64145fd4c3fd0cc786b7ad62fc191e.zip
opensim-SC_OLD-e881f35fbb64145fd4c3fd0cc786b7ad62fc191e.tar.gz
opensim-SC_OLD-e881f35fbb64145fd4c3fd0cc786b7ad62fc191e.tar.bz2
opensim-SC_OLD-e881f35fbb64145fd4c3fd0cc786b7ad62fc191e.tar.xz
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
Diffstat (limited to 'OpenSim/Framework')
-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 a7d34f5..7274a06 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.91CM"; 32 private const string VERSION_NUMBER = "0.6.92Ch";
33 private const Flavour VERSION_FLAVOUR = Flavour.Dev; 33 private const Flavour VERSION_FLAVOUR = Flavour.Dev;
34 public enum Flavour 34 public enum Flavour
35 { 35 {