diff options
| author | Thomas Grimshaw | 2010-04-05 23:17:31 +0200 |
|---|---|---|
| committer | Thomas Grimshaw | 2010-04-05 23:17:31 +0200 |
| commit | fd4a059e9bf0beda9907e90da8c78cc48d88eb98 (patch) | |
| tree | 588a95f9eedd40dbc6296dd085f7e3a5502e1083 /OpenSim | |
| parent | Fix up my own shoddy code! Fixes prim rez break. Whups! (diff) | |
| parent | Test commit (diff) | |
| download | opensim-SC-fd4a059e9bf0beda9907e90da8c78cc48d88eb98.zip opensim-SC-fd4a059e9bf0beda9907e90da8c78cc48d88eb98.tar.gz opensim-SC-fd4a059e9bf0beda9907e90da8c78cc48d88eb98.tar.bz2 opensim-SC-fd4a059e9bf0beda9907e90da8c78cc48d88eb98.tar.xz | |
Merge branch 'master' of ssh://TOR/var/git/careminster
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Framework/Servers/VersionInfo.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Servers/VersionInfo.cs b/OpenSim/Framework/Servers/VersionInfo.cs index 58d65d1..cf417d7 100644 --- a/OpenSim/Framework/Servers/VersionInfo.cs +++ b/OpenSim/Framework/Servers/VersionInfo.cs | |||
| @@ -29,11 +29,11 @@ namespace OpenSim | |||
| 29 | { | 29 | { |
| 30 | public class VersionInfo | 30 | public class VersionInfo |
| 31 | { | 31 | { |
| 32 | private const string VERSION_NUMBER = "0.6.8CM"; | 32 | private const string VERSION_NUMBER = "0.6.9CM"; |
| 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 |
| 36 | { | 36 | { |
| 37 | Unknown, | 37 | Unknown, |
| 38 | Dev, | 38 | Dev, |
| 39 | RC1, | 39 | RC1, |