aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers
diff options
context:
space:
mode:
authorMelanie2011-04-25 23:18:32 +0100
committerMelanie2011-04-25 23:18:32 +0100
commit9bf5e94b70c045e32e259f282c693c0fcea514a2 (patch)
tree71a6b6029d2cc74cf34fd5e09719f39f9f7a9422 /OpenSim/Framework/Servers
parentMerge branch 'master' into careminster-presence-refactor (diff)
parentMade things consistent between LocalInventoryServiceConnector and RemoteXInve... (diff)
downloadopensim-SC-9bf5e94b70c045e32e259f282c693c0fcea514a2.zip
opensim-SC-9bf5e94b70c045e32e259f282c693c0fcea514a2.tar.gz
opensim-SC-9bf5e94b70c045e32e259f282c693c0fcea514a2.tar.bz2
opensim-SC-9bf5e94b70c045e32e259f282c693c0fcea514a2.tar.xz
Merge branch 'master' 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 ce6ecf8..24758e8 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.7.1"; 32 private const string VERSION_NUMBER = "0.7.2";
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