ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-15 11:25:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
Files
c754003944d0166bf50b4f94b0c0eea642503bb0
opensim/OpenSim/Server
History
BlueWall c754003944 Merge branch 'master' into connector_plugin 
Conflicts:
	OpenSim/Server/Base/ServicesServerBase.cs
2012-11-25 17:03:14 -05:00
..
Base
Merge branch 'master' into connector_plugin
2012-11-25 17:03:14 -05:00
Handlers
Merge branch 'master' into connector_plugin
2012-11-25 17:03:14 -05:00
Properties
The last few AssemblyInfos. Finished!
2012-11-14 21:18:18 -08:00
ServerMain.cs
missed some conflict markup
2012-10-09 07:59:44 -04:00