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

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

2012-07-29 16:11:20 +01:00

..

Archiver

Allow load and save of IAR without a password. The password must still be

2012-07-24 11:38:30 +02:00

Transfer

Merge branch 'master' into careminster

2012-07-19 09:47:51 +01:00