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

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

2012-06-15 15:48:34 +01:00

..

Interfaces

refactor: Eliminate local id parameter from api initialize.

2012-05-08 23:20:27 +01:00

Shared

Merge branch 'avination' into careminster

2012-06-15 15:48:34 +01:00

XEngine

Merge branch 'master' into careminster

2012-04-27 17:09:49 +01:00