Melanie 95d0a7d4fa Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs		2013-03-26 03:26:02 +00:00
..
Application	Merge branch 'master' into careminster	2013-03-15 23:45:32 +00:00
ClientStack	Merge branch 'master' into careminster	2013-03-15 23:45:32 +00:00
CoreModules	Merge branch 'master' into careminster	2013-03-26 03:26:02 +00: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-03-23 23:01:55 +00:00
OptionalModules	Merge branch 'master' into careminster	2013-03-23 23:01:55 +00:00
Physics	Merge branch 'master' into careminster	2013-03-26 03:26:02 +00:00
RegionCombinerModule	Add "show borders" command to show the borders of a region.	2013-03-23 00:45:21 +00:00
ReplaceableModules	…
ScriptEngine	Merge branch 'avination' into careminster	2013-03-19 01:24:14 +00:00
UserStatistics	Deleted all AssemblyFileVersion directives	2013-02-19 17:14:55 -08:00