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

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

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

..

Application

Merge branch 'careminster' into avination

2012-11-23 03:42:04 +00:00

ClientStack

Merge branch 'master' into careminster

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

CoreModules

Merge branch 'master' into careminster

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

DataSnapshot

Added AssemblyInfos to every dll in the OpenSim.Region namespace.

2012-11-14 11:09:43 -08:00

Framework

Merge branch 'master' into careminster

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

OptionalModules

Merge branch 'avination' into careminster

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

Physics

Merge branch 'master' into careminster

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

RegionCombinerModule

Revert "Merge master into teravuswork", it should have been avination, not master.

2012-11-15 10:05:16 -05:00

ReplaceableModules

…

ScriptEngine

Merge branch 'master' into careminster

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

UserStatistics

Revert "Merge master into teravuswork", it should have been avination, not master.

2012-11-15 10:05:16 -05:00