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

Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs

2013-03-03 13:24:37 +00:00

..

AssetTransaction

Merge branch 'avination' into careminster

2013-03-03 13:24:37 +00:00

IPBan

Another 21 modules' directives moved out of .addin.xml

2012-11-13 08:27:51 -08:00

TextureSender

Another 21 modules' directives moved out of .addin.xml

2012-11-13 08:27:51 -08:00

Xfer

Merge branch 'master' into careminster

2012-11-13 02:10:09 +00:00