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	…
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	…
Framework	…
OptionalModules	Merge branch 'master' into careminster	2012-11-13 02:10:09 +00:00
Physics	…
RegionCombinerModule	…
ReplaceableModules	…
ScriptEngine	…
UserStatistics	…