Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-11-02 22:58:33 +00:00
44 changed files with 19371 additions and 19377 deletions

View File

@@ -69,6 +69,6 @@ namespace OpenSim
/// of the code that is too old.
///
/// </value>
public readonly static int MajorInterfaceVersion = 6;
public readonly static int MajorInterfaceVersion = 7;
}
}