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.dylib	…
libBulletSim.so	BulletSim: enable GImpact shape for prims with cuts. Include DLLs and SOs	2013-05-26 17:35:12 -07:00
libode.so	…
libopenjpeg-dotnet.so	…
libsqlite3.txt	…
libsqlite3_32.so	…
ode.dll	…
sqlite3.dll	Add 64 bit Windows sqlite3.dll and use this if running a 64-bit windows process.	2012-02-21 02:52:20 +00:00