Melanie 556d70feef Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs

2012-11-13 17:37:39 +00:00

..

Tests

Adjust namespce of FlotsamCache

2012-09-09 14:35:48 -04:00

CenomeAssetCache.cs

Another 21 modules' directives moved out of .addin.xml

2012-11-13 08:27:51 -08:00

CoreAssetCache.cs

Another 21 modules' directives moved out of .addin.xml

2012-11-13 08:27:51 -08:00

FlotsamAssetCache.cs

Merge branch 'master' into careminster

2012-11-13 02:10:09 +00:00

GlynnTuckerAssetCache.cs

Another 21 modules' directives moved out of .addin.xml

2012-11-13 08:27:51 -08:00