669fa3ff9a
Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs |
||
---|---|---|
.. | ||
BulletSim.dll | ||
libBulletSim.so | ||
libode-x86_64.so | ||
libode.dylib | ||
libopenjpeg-dotnet-x86_64.so | ||
libopenjpeg-dotnet.dylib | ||
libsqlite3.dylib | ||
libsqlite3_64.so | ||
ode.dll | ||
sqlite3.dll |