aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJohn Hurliman2010-03-26 12:21:24 -0700
committerJohn Hurliman2010-03-26 12:21:24 -0700
commit3e8cb7a9a0304f369be6c7f9ce7922d1037e92c0 (patch)
treee249525e9ffcbb22579a58c7ea23a6036933dc69
parent* Fixed a bug with null value handling in WebUtil.BuildQueryString() (diff)
parentchange trunk version to 0.7.Dev (diff)
downloadopensim-SC_OLD-3e8cb7a9a0304f369be6c7f9ce7922d1037e92c0.zip
opensim-SC_OLD-3e8cb7a9a0304f369be6c7f9ce7922d1037e92c0.tar.gz
opensim-SC_OLD-3e8cb7a9a0304f369be6c7f9ce7922d1037e92c0.tar.bz2
opensim-SC_OLD-3e8cb7a9a0304f369be6c7f9ce7922d1037e92c0.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
-rw-r--r--OpenSim/Framework/Servers/VersionInfo.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Servers/VersionInfo.cs b/OpenSim/Framework/Servers/VersionInfo.cs
index ec94b2d..90b5f57 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.9"; 32 private const string VERSION_NUMBER = "0.7";
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
@@ -71,4 +71,4 @@ namespace OpenSim
71 /// </value> 71 /// </value>
72 public readonly static int MajorInterfaceVersion = 6; 72 public readonly static int MajorInterfaceVersion = 6;
73 } 73 }
74} 74} \ No newline at end of file