ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-16 12:42:02 +08:00
Code Issues Packages Projects Releases Wiki Activity
Files
e7a6328ea40bbbc5dba50ca21ec4e9e2c7283081
opensim/OpenSim/Region/ClientStack/Linden
History
Melanie a2c6094324 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/TaskInventoryItem.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
2012-10-31 21:42:06 +00:00
..
Caps
Merge branch 'avination' into careminster
2012-10-18 20:56:34 +01:00
UDP
Merge branch 'master' into careminster
2012-10-31 21:42:06 +00:00