Files
opensim/OpenSim/Region/CoreModules/Asset
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
..
2012-09-09 14:35:48 -04:00
2010-02-15 19:21:56 +09:00