Melanie 45e333652c Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs		2013-06-07 23:09:53 +01:00
..
Application	Merge branch 'master' into careminster	2013-05-04 01:22:12 +01:00
ClientStack	Merge branch 'avination-current' into careminster	2013-06-06 03:20:15 +01:00
CoreModules	Merge branch 'master' into careminster	2013-06-07 23:09:53 +01:00
DataSnapshot	Bug fix in DataSnapshot, where a var was being used before being initialized.	2013-02-28 14:20:07 -08:00
Framework	Merge branch 'master' into careminster	2013-06-07 23:09:53 +01:00
OptionalModules	Merge branch 'avination-current' into careminster	2013-06-06 03:20:15 +01:00
Physics	Merge branch 'avination-current' into careminster	2013-06-06 03:20:15 +01:00
RegionCombinerModule	Fix taking (and rezzing) of coalesced objects in the non-root subregions of megaregions.	2013-04-06 02:34:51 +01:00
ReplaceableModules	…
ScriptEngine	Merge branch 'avination-current' into careminster	2013-06-06 03:20:15 +01:00
UserStatistics	Deleted all AssemblyFileVersion directives	2013-02-19 17:14:55 -08:00