Melanie 11c48ac807 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs

2012-01-06 21:41:36 +00:00

..

Api

Merge branch 'master' into careminster

2012-01-06 21:41:36 +00:00

CodeTools

Optionally, don't delete previously compiled scripts on startup

2011-06-24 22:07:20 +01:00

Instance

minor: remove mono compiler warning

2011-11-26 01:40:46 +00:00

Tests

Replaced llRot2Euler function.

2012-01-06 21:30:51 +00:00

AssemblyResolver.cs

Merge Master

2010-09-26 17:56:31 +01:00

Helpers.cs

Resolve merge commits, stage 1

2011-09-04 07:06:36 -07:00

LSL_Types.cs

Resolve merge commits, stage 1

2011-09-04 07:06:36 -07:00