Melanie f567ff9f51 Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs		2013-02-06 02:22:12 +00:00
..
ApplicationPlugins	Merge branch 'master' into careminster	2013-02-05 21:30:12 +00:00
Capabilities	Merge branch 'master' into careminster	2013-02-05 21:30:12 +00:00
ConsoleClient	Bump version and assembly version numbers from 0.7.5 to 0.7.6	2013-02-05 00:23:17 +00:00
Data	Merge branch 'master' into careminster	2013-02-05 21:30:12 +00:00
Framework	Merge branch 'master' into careminster	2013-02-05 21:30:12 +00:00
Region	Merge branch 'master' into careminster	2013-02-06 02:22:12 +00:00
Server	Merge branch 'master' into careminster	2013-02-05 21:30:12 +00:00
Services	Merge branch 'master' into careminster	2013-02-06 02:22:12 +00:00
Tests	Merge branch 'master' into careminster	2013-01-26 01:56:23 +00:00
Tools	Bump version and assembly version numbers from 0.7.5 to 0.7.6	2013-02-05 00:23:17 +00:00