diff options
author | Melanie | 2009-11-26 17:45:09 +0000 |
---|---|---|
committer | Melanie | 2009-11-26 17:45:09 +0000 |
commit | ed148eba324cf72b4100f83f6d5f7cb35cb46bba (patch) | |
tree | b8f813d74183776a70b6752e5b409dcc169de019 /OpenSim/Framework | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC-ed148eba324cf72b4100f83f6d5f7cb35cb46bba.zip opensim-SC-ed148eba324cf72b4100f83f6d5f7cb35cb46bba.tar.gz opensim-SC-ed148eba324cf72b4100f83f6d5f7cb35cb46bba.tar.bz2 opensim-SC-ed148eba324cf72b4100f83f6d5f7cb35cb46bba.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Servers/VersionInfo.cs | 2 |
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 |