Melanie bf565e9747 Merge branch 'avination' into careminster ...

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

2012-10-03 17:40:11 +01:00

..

Interfaces

Revert "Fix script "Running" behavior"

2012-07-16 23:31:55 +01:00

Shared

Merge branch 'avination' into careminster

2012-10-03 17:40:11 +01:00

XEngine

Merge branch 'master' into careminster

2012-10-03 00:24:33 +01:00