Melanie 0c1074537b Merge branch 'master' into careminster ...

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

2012-02-16 00:38:04 +00:00

..

AutoBackup

Line endings

2011-11-23 16:09:11 -08:00

MoneyModule

Merge branch 'master' into careminster

2012-01-28 01:01:23 +00:00

NPC

Merge branch 'master' into careminster

2012-02-16 00:38:04 +00:00

TreePopulator

Merge commit '146322eb34c15a5722cfe42dd012821ddf441fe6' into bigmerge

2011-10-12 01:31:34 +01:00

WorldView

Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead of OSHttpRequest/OSHttpResponse.

2011-12-05 20:44:20 +00:00