diff options
| author | Thomas Grimshaw | 2010-04-05 22:11:11 +0200 |
|---|---|---|
| committer | Thomas Grimshaw | 2010-04-05 22:11:11 +0200 |
| commit | 07b4889eab148efedb5ea554b2ed5eb4ca30752c (patch) | |
| tree | 1dca4c8b04e17e57772a999d55a38a1346eebd01 /OpenSim/Framework | |
| parent | This commit adds some randomness to object persistence. It's a Work In Progre... (diff) | |
| parent | Fix some overlooked merge conflicts that got committed (diff) | |
| download | opensim-SC_OLD-07b4889eab148efedb5ea554b2ed5eb4ca30752c.zip opensim-SC_OLD-07b4889eab148efedb5ea554b2ed5eb4ca30752c.tar.gz opensim-SC_OLD-07b4889eab148efedb5ea554b2ed5eb4ca30752c.tar.bz2 opensim-SC_OLD-07b4889eab148efedb5ea554b2ed5eb4ca30752c.tar.xz | |
Merge branch 'master' of ssh://TOR/var/git/careminster
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/Servers/VersionInfo.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Framework/Servers/VersionInfo.cs b/OpenSim/Framework/Servers/VersionInfo.cs index f618047..58d65d1 100644 --- a/OpenSim/Framework/Servers/VersionInfo.cs +++ b/OpenSim/Framework/Servers/VersionInfo.cs | |||
| @@ -31,6 +31,7 @@ namespace OpenSim | |||
| 31 | { | 31 | { |
| 32 | private const string VERSION_NUMBER = "0.6.8CM"; | 32 | private const string VERSION_NUMBER = "0.6.8CM"; |
| 33 | private const Flavour VERSION_FLAVOUR = Flavour.Dev; | 33 | private const Flavour VERSION_FLAVOUR = Flavour.Dev; |
| 34 | |||
| 34 | public enum Flavour | 35 | public enum Flavour |
| 35 | { | 36 | { |
| 36 | Unknown, | 37 | Unknown, |