Melanie bf630fb808 Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs		2012-05-02 01:37:51 +01:00
..
Application	Merge branch 'master' into careminster	2012-04-29 02:23:54 +01:00
ClientStack	Merge branch 'master' into careminster	2012-05-02 01:37:51 +01:00
CoreModules	Merge branch 'master' into careminster	2012-05-02 01:37:51 +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-05-02 01:37:51 +01:00
OptionalModules	Merge branch 'master' into careminster	2012-04-29 02:23:54 +01:00
Physics	Merge branch 'avination'	2012-05-02 00:33:56 +02:00
RegionCombinerModule	Merge branch 'master' into careminster	2012-03-11 02:29:43 +00:00
ReplaceableModules	…
ScriptEngine	Merge branch 'avination'	2012-05-02 00:33:56 +02:00
UserStatistics	Move some public methods on WebStatsModule to private to reduce some static analysis complexity.	2012-04-17 01:33:55 +01:00