Melanie 1c4bcf3fed Fix merge artefacts

2012-04-03 23:13:48 +02:00

..

ApplicationPlugins

Merge branch 'master' into careminster

2012-02-04 11:48:20 +00:00

Capabilities

Implement the FetchInventory2 capability. This accompanies the existing FetchInventoryDescendents2 capability.

2012-01-06 21:07:34 +00:00

ConsoleClient

Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead of the other way around.

2011-10-25 20:24:21 +01:00

Data

Merge branch 'master' into careminster

2012-03-31 02:18:02 +01:00

Framework

Merge branch 'master' into careminster

2012-03-31 02:18:02 +01:00

Region

Fix merge artefacts

2012-04-03 23:13:48 +02:00

Server

Merge branch 'master' into careminster

2012-03-27 18:11:05 +01:00

Services

Merge branch 'master' into careminster

2012-03-31 02:18:02 +01:00

Tests

Merge branch 'master' into careminster

2012-03-31 02:18:02 +01:00

Tools

minor: Rename pCampbot console prompt to "pCampbot" rather than "Region"

2012-03-02 01:54:48 +00:00