ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-19 22:26:13 +08:00
Code Issues Packages Projects Releases Wiki Activity
Files
96409cc2eeb4555609f72c8bc61fbdf4ac3e9933
opensim/OpenSim
History
Melanie 96409cc2ee Merge branch 'ubitwork' 
Conflicts:
	OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
	OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs
2012-02-19 20:08:01 +01:00
..
ApplicationPlugins
Merge branch 'master' into careminster
2012-02-04 11:48:20 +00:00
Capabilities
Implement the FetchInventory2 capability. This accompanies the existing FetchInventoryDescendents2 capability.
2012-01-06 21:07:34 +00:00
ConsoleClient
…
Data
Merge branch 'master' into careminster
2012-02-18 22:21:10 +00:00
Framework
Merge branch 'master' into careminster
2012-02-18 22:21:10 +00:00
Region
Merge branch 'ubitwork'
2012-02-19 20:08:01 +01:00
Server
Merge branch 'master' into careminster
2012-02-02 22:36:41 +00:00
Services
Merge branch 'master' into careminster
2012-02-18 22:21:10 +00:00
Tests
Merge branch 'master' into careminster
2012-02-16 00:38:04 +00:00
Tools
minor: add missing newlines to pCampbot usage statement
2012-01-03 15:42:36 +00:00