Melanie 924df14c5e Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
	OpenSim/Framework/Servers/VersionInfo.cs

2012-09-07 19:49:46 +01:00

..

ICM_Api.cs

Add the country functions in the careminster API

2011-02-12 20:59:09 +01:00

ILS_Api.cs

Add lsClearWindlightScene() to the lightshare module to remove WL settings

2010-11-03 02:31:43 +00:00

ILSL_Api.cs

Merge branch 'master' into careminster

2012-08-29 03:31:13 +01:00

IMOD_Api.cs

Add a hust UUID to the script invocations

2012-03-26 14:19:55 +01:00

IOSSL_Api.cs

Merge branch 'master' into careminster

2012-09-07 19:49:46 +01:00