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

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

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

..

Interfaces

Update SmartThreadPool to latest version 2.2.3 with a major and minor change.

2013-05-01 19:01:43 +01:00

Shared

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

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

XEngine

Merge branch 'avination-current'

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