Melanie 556d70feef Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs

2012-11-13 17:37:39 +00:00

..

Agent

Merge branch 'master' into careminster

2012-11-13 17:37:39 +00:00

Asset

Merge branch 'master' into careminster

2012-11-13 17:37:39 +00:00

Avatar

Merge branch 'master' into careminster

2012-11-13 17:37:39 +00:00

Framework

Merge branch 'master' into careminster

2012-11-13 17:37:39 +00:00

Hypergrid

Merge branch 'master' into careminster

2012-11-13 10:49:24 +00:00

Properties

Deleted .addin.xml. Added AssemblyInfo.cs

2012-11-13 09:04:32 -08:00

Scripting

Merge branch 'master' into careminster

2012-11-13 17:37:39 +00:00

ServiceConnectorsIn

Another 11 modules' directions moved out of .addin.xml

2012-11-13 08:36:44 -08:00

ServiceConnectorsOut

Merge branch 'master' into careminster

2012-11-13 17:37:39 +00:00

World

Merge branch 'master' into careminster

2012-11-13 17:37:39 +00:00