aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers/VersionInfo.cs
diff options
context:
space:
mode:
authorCasperW2009-12-21 13:29:48 +0100
committerCasperW2009-12-21 13:29:48 +0100
commitd8d6e8a30415197eb55c59172abfb890ec7a46bd (patch)
treedb937d6c6e3816932781e7be90c318408d117a78 /OpenSim/Framework/Servers/VersionInfo.cs
parentFixed a nasty crash in StandUp() that occurred when the part got killed with ... (diff)
parentMerge branch 'master' into careminster (diff)
downloadopensim-SC_OLD-d8d6e8a30415197eb55c59172abfb890ec7a46bd.zip
opensim-SC_OLD-d8d6e8a30415197eb55c59172abfb890ec7a46bd.tar.gz
opensim-SC_OLD-d8d6e8a30415197eb55c59172abfb890ec7a46bd.tar.bz2
opensim-SC_OLD-d8d6e8a30415197eb55c59172abfb890ec7a46bd.tar.xz
Merge branch 'master' into casper
Diffstat (limited to 'OpenSim/Framework/Servers/VersionInfo.cs')
-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 d348c90..a7d34f5 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.9CM"; 32 private const string VERSION_NUMBER = "0.6.91CM";
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 {