Melanie fe65b51876 Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs		2012-04-13 03:00:48 +01:00
..
Application	Merge branch 'master' into careminster	2012-03-25 20:07:43 +01:00
ClientStack	Merge branch 'master' into careminster	2012-04-07 04:52:14 +01:00
CoreModules	Merge branch 'master' into careminster	2012-04-11 23:35:27 +01:00
DataSnapshot	Datasnapshot: added "secret" to the registration/deregistration query so that data providers can verify authenticity if they want.	2012-03-13 08:06:30 -07:00
Framework	Merge branch 'master' into careminster	2012-04-13 03:00:48 +01:00
OptionalModules	Merge branch 'master' into careminster	2012-04-07 04:52:14 +01:00
Physics	reduced instability in vertical atractor with eficiency of 1 and banking	2012-03-31 00:03:45 +01:00
RegionCombinerModule	Merge branch 'master' into careminster	2012-03-11 02:29:43 +00:00
ReplaceableModules	…
ScriptEngine	Merge branch 'master' into careminster	2012-04-13 03:00:48 +01:00
UserStatistics	Call Dispose() via using() on SqliteCommands in WebStatsModule after use.	2012-02-28 22:54:21 +00:00