Melanie 56b2bc7101 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/Physics/Manager/IMesher.cs

2012-11-30 01:54:13 +00:00

..

ApplicationPlugins

Merge branch 'master' into careminster

2012-11-17 02:03:24 +00:00

Capabilities

Merge branch 'avination' into careminster

2012-11-25 14:14:20 +00:00

ConsoleClient

A few more AssemblyInfos in a few more dlls.

2012-11-14 08:10:15 -08:00

Data

Merge branch 'master' into careminster

2012-11-30 01:19:08 +00:00

Framework

Merge branch 'master' into careminster

2012-11-25 14:13:50 +00:00

Region

Merge branch 'master' into careminster

2012-11-30 01:54:13 +00:00

Server

Merge branch 'master' into careminster

2012-11-22 13:37:27 +00:00

Services

Merge branch 'master' into careminster

2012-11-17 02:03:24 +00:00

Tests

Merge branch 'master' into careminster

2012-11-25 14:13:50 +00:00

Tools

The last few AssemblyInfos. Finished!

2012-11-14 21:18:18 -08:00