aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2009-11-26 17:44:15 +0000
committerMelanie2009-11-26 17:44:15 +0000
commit58aad366ddfaf9b89ca06d553f7a278ca35619b6 (patch)
treed96ef4058bc17c4b63928b0a6c813956b8130f30 /OpenSim
parentAdded osGetRegionStats() function, to return a number of sim statistics (diff)
parentMerge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-58aad366ddfaf9b89ca06d553f7a278ca35619b6.zip
opensim-SC_OLD-58aad366ddfaf9b89ca06d553f7a278ca35619b6.tar.gz
opensim-SC_OLD-58aad366ddfaf9b89ca06d553f7a278ca35619b6.tar.bz2
opensim-SC_OLD-58aad366ddfaf9b89ca06d553f7a278ca35619b6.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim')
-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 9f98310..ec94b2d 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.8"; 32 private const string VERSION_NUMBER = "0.6.9";
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