Melanie 9a5679876e Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs		2012-11-13 02:10:09 +00:00
..
Application	Merge branch 'master' into careminster	2012-11-12 23:27:47 +00:00
ClientStack	Merge branch 'master' into careminster	2012-11-13 02:10:09 +00:00
CoreModules	Merge branch 'master' into careminster	2012-11-13 02:10:09 +00:00
DataSnapshot	Cleanup on region modules: gave short node id's to all of them.	2012-11-12 18:08:02 -08:00
Framework	Merge branch 'master' into careminster	2012-11-12 23:27:47 +00:00
OptionalModules	Merge branch 'master' into careminster	2012-11-13 02:10:09 +00:00
Physics	Merge branch 'master' into careminster	2012-11-09 22:58:42 +00:00
RegionCombinerModule	Changed "course" to "coarse" in several places	2012-10-25 23:32:37 +01:00
ReplaceableModules	…
ScriptEngine	Merge branch 'master' into careminster	2012-11-09 22:58:42 +00:00
UserStatistics	One more module converted: WebStatsModule.	2012-11-11 17:02:22 -08:00