Melanie 669fa3ff9a Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs		2013-05-30 21:48:09 +01:00
..
BulletSim.dll	BulletSim: enable GImpact shape for prims with cuts. Include DLLs and SOs	2013-05-26 17:35:12 -07:00
libBulletSim.so	BulletSim: enable GImpact shape for prims with cuts. Include DLLs and SOs	2013-05-26 17:35:12 -07:00
libode-x86_64.so	…
libode.dylib	…
libopenjpeg-dotnet-x86_64.so	…
libopenjpeg-dotnet.dylib	…
libsqlite3.dylib	…
libsqlite3_64.so	…
ode.dll	…
sqlite3.dll	…