OpenSimMirror/OpenSim
Jonathan Freedman c8d65c359f Merge branch 'master' into mantis5110
Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
2010-10-29 23:58:14 -04:00
..
ApplicationPlugins
Client
ConsoleClient
Data
Framework Merge branch 'master' into mantis5110 2010-10-29 23:58:14 -04:00
Region Merge branch 'master' into mantis5110 2010-10-29 23:58:14 -04:00
Server
Services
TestSuite
Tests
Tools