Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/Application/OpenSim.cs OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/Framework/Scenes/SceneManager.cs bin/OpenMetaverse.Rendering.Meshmerizer.dll bin/OpenMetaverse.StructuredData.dll bin/OpenMetaverse.dll bin/OpenMetaverseTypes.dll prebuild.xml |
||
|---|---|---|
| .. | ||
| BulletSim.dll | ||
| libBulletSim.so | ||
| libode.so | ||
| libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686.so | ||
| libopenjpeg-dotnet-2.1.3.0-dotnet-1.so | ||
| libsqlite3.txt | ||
| libsqlite3_32.so | ||
| ode.dll | ||
| sqlite3.dll | ||