Melanie 437326a480 Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster ...

Conflicts:
	OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
	OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs

2013-07-18 10:17:30 +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' of ssh://melanie@3dhosting.de/var/git/careminster into careminster

2013-07-18 10:17:30 +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 'avination' into careminster

2013-03-03 13:24:37 +00:00