diff options
| author | Melanie | 2009-10-22 17:41:42 +0100 |
|---|---|---|
| committer | Melanie | 2009-10-22 17:41:42 +0100 |
| commit | 5d12170df92b3bfad2862c40da9742fbc3cf219b (patch) | |
| tree | c054a79085982a291519713f5067de49ba0f54c0 | |
| parent | Merge branch 'vehicles' (diff) | |
| download | opensim-SC_OLD-5d12170df92b3bfad2862c40da9742fbc3cf219b.zip opensim-SC_OLD-5d12170df92b3bfad2862c40da9742fbc3cf219b.tar.gz opensim-SC_OLD-5d12170df92b3bfad2862c40da9742fbc3cf219b.tar.bz2 opensim-SC_OLD-5d12170df92b3bfad2862c40da9742fbc3cf219b.tar.xz | |
Correct version number after merge
| -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 62e7e92..9f98310 100644 --- a/OpenSim/Framework/Servers/VersionInfo.cs +++ b/OpenSim/Framework/Servers/VersionInfo.cs | |||
| @@ -29,8 +29,8 @@ namespace OpenSim | |||
| 29 | { | 29 | { |
| 30 | public class VersionInfo | 30 | public class VersionInfo |
| 31 | { | 31 | { |
| 32 | private const string VERSION_NUMBER = "0.6.7"; | 32 | private const string VERSION_NUMBER = "0.6.8"; |
| 33 | private const Flavour VERSION_FLAVOUR = Flavour.RC1; | 33 | private const Flavour VERSION_FLAVOUR = Flavour.Dev; |
| 34 | 34 | ||
| 35 | public enum Flavour | 35 | public enum Flavour |
| 36 | { | 36 | { |