Melanie 23d5bafa7f Merge branch 'master' into careminster ...

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

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

..

Resources

…

Tests

Allow XEngine StartDelay to be configured in the [XEngine] config section.

2012-07-11 21:55:18 +01:00

EventManager.cs

Add money event routing to the script engine.

2012-10-02 01:25:55 +01:00

XEngine.cs

Merge commit 'a0d178b284050df64d0eb5b9728565fd72615c22' into careminster

2012-08-25 18:08:10 +01:00

XWorkItem.cs

…