Melanie d0cc0985fa Fix a merge conflict

2009-10-01 14:45:06 +01:00

..

ApplicationPlugins

Formatting cleanup.

2009-10-01 01:17:47 +09:00

Client

Formatting cleanup.

2009-10-01 01:17:47 +09:00

ConsoleClient

Fix some compile warnings.

2009-08-26 14:02:52 +09:00

Data

Formatting cleanup.

2009-10-01 09:38:36 +09:00

Framework

Merge branch 'master' into vehicles

2009-10-01 14:08:15 +01:00

Grid

Formatting cleanup.

2009-10-01 01:17:47 +09:00

Region

Fix a merge conflict

2009-10-01 14:45:06 +01:00

ScriptEngine

Formatting cleanup.

2009-10-01 01:17:47 +09:00

Server

Formatting cleanup.

2009-10-01 09:38:36 +09:00

Services

Formatting cleanup.

2009-10-01 01:17:47 +09:00

Tests

Formatting cleanup.

2009-10-01 01:17:47 +09:00

TestSuite

Minor: Change OpenSim to OpenSimulator in older copyright headers and LICENSE.txt.

2009-06-01 06:37:14 +00:00

Tools

Add copyright header. Formatting cleanup.

2009-09-29 08:32:59 +09:00