Merge branch 'master' of ssh://TOR/var/git/careminster

avinationmerge
Thomas Grimshaw 2010-04-05 23:17:31 +02:00
commit fd4a059e9b
1 changed files with 2 additions and 2 deletions

View File

@ -29,11 +29,11 @@ namespace OpenSim
{ {
public class VersionInfo public class VersionInfo
{ {
private const string VERSION_NUMBER = "0.6.8CM"; private const string VERSION_NUMBER = "0.6.9CM";
private const Flavour VERSION_FLAVOUR = Flavour.Dev; private const Flavour VERSION_FLAVOUR = Flavour.Dev;
public enum Flavour public enum Flavour
{ {
Unknown, Unknown,
Dev, Dev,
RC1, RC1,