Melanie Thielker e1b2ecdfdc Merge branch 'avination-current' ...

Conflicts:
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs

2014-07-19 22:32:07 +02:00

..

Application

Merge branch 'master' into careminster

2014-01-28 21:02:20 +00:00

ClientStack

Merge branch 'master' of ssh://3dhosting.de/var/git/careminster

2014-06-21 00:39:55 +02:00

CoreModules

Merge branch 'avination-current'

2014-07-19 22:32:07 +02:00

DataSnapshot

refactor: replace verbose checks with String.IsNullOrEmpty where applicable.

2013-11-15 21:45:08 +00:00

Framework

Merge branch 'avination-current'

2014-07-19 22:32:07 +02:00

OptionalModules

Merge branch 'master' of ssh://3dhosting.de/var/git/careminster

2014-06-21 00:39:55 +02:00

Physics

Merge branch 'avination-current'

2014-07-19 22:32:07 +02:00

RegionCombinerModule

Merge branch 'master' of ssh://3dhosting.de/var/git/careminster

2014-06-21 00:39:55 +02:00

ReplaceableModules

…

ScriptEngine

Merge branch 'avination-current'

2014-07-19 22:32:07 +02:00

UserStatistics

Bump OPenSimulator version and assembly versions up to 0.8.0 Dev

2013-10-04 23:33:47 +01:00