Melanie dbec5e9859 Fix more merge artefacts

2012-04-03 23:22:47 +02:00

..

Application

Merge branch 'master' into careminster

2012-03-25 20:07:43 +01:00

ClientStack

Implement bulk inventory update over CAPS (not recursive by design,

2012-03-31 02:32:47 +01:00

CoreModules

Merge branch 'master' into careminster

2012-04-03 23:52:53 +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

Fix more merge artefacts

2012-04-03 23:22:47 +02:00

OptionalModules

Merge branch 'master' into careminster

2012-03-31 02:18:02 +01:00

Physics

Merge branch 'master' into careminster

2012-03-27 18:11:05 +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-03 23:52:53 +01:00

UserStatistics

Call Dispose() via using() on SqliteCommands in WebStatsModule after use.

2012-02-28 22:54:21 +00:00