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
..
ApplicationPlugins	…
Capabilities	…
ConsoleClient	…
Data	…
Framework	…
Region	Merge branch 'master' into careminster	2012-11-13 02:10:09 +00:00
Server	…
Services	Merge branch 'master' into careminster	2012-11-13 02:10:09 +00:00
Tests	…
Tools	…