OpenSimMirror/OpenSim
Melanie 8c5445b774 Merge branch 'master' into careminster
Conflicts:
	ThirdParty/SmartThreadPool/SmartThreadPool.cs
2013-05-01 21:39:49 +01:00
..
Addons Groups: make some methods protected. 2013-04-25 17:01:57 -07:00
ApplicationPlugins
Capabilities Merge branch 'master' into careminster 2013-05-01 21:39:49 +01:00
ConsoleClient
Data Merge branch 'master' into careminster 2013-04-29 00:38:20 +01:00
Framework Merge branch 'master' into careminster 2013-05-01 21:39:49 +01:00
Region Merge branch 'master' into careminster 2013-05-01 21:39:49 +01:00
Server Merge branch 'master' into careminster 2013-04-30 23:45:38 +01:00
Services Merge branch 'master' into careminster 2013-04-29 00:38:20 +01:00
Tests Merge branch 'master' into careminster 2013-04-30 23:45:38 +01:00
Tools