Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations |
||
|---|---|---|
| .. | ||
| BulletSim.dll | ||
| libBulletSim.so | ||
| libode.so | ||
| libopenjpeg-dotnet.so | ||
| libsqlite3.txt | ||
| libsqlite3_32.so | ||
| ode.dll | ||
| sqlite3.dll | ||
Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations |
||
|---|---|---|
| .. | ||
| BulletSim.dll | ||
| libBulletSim.so | ||
| libode.so | ||
| libopenjpeg-dotnet.so | ||
| libsqlite3.txt | ||
| libsqlite3_32.so | ||
| ode.dll | ||
| sqlite3.dll | ||