Merge branch 'careminster' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-04-13 04:36:08 +01:00
25 changed files with 694 additions and 203 deletions

View File

@@ -33,7 +33,7 @@ namespace OpenSim
private const Flavour VERSION_FLAVOUR = Flavour.Dev;
public enum Flavour
{
{
Unknown,
Dev,
RC1,