Melanie 91b70bf3fe Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs		2013-11-08 17:55:01 +00:00
..
BulletSim.dll	BulletSim: restore collision flags when clear collision cache.	2013-10-26 21:30:51 -07:00
libBulletSim.so	BulletSim: restore collision flags when clear collision cache.	2013-10-26 21:30:51 -07:00
libode-x86_64.so	…
libode.dylib	…
libopenjpeg-dotnet-x86_64.so	Update libopenjpeg libraries used by libopenmetaverse back up to 1.5, this time using lkalif's linux libraries built against a much earlier libc (2.7)	2012-09-20 01:26:35 +01:00
libopenjpeg-dotnet.dylib	Replace the 64 bit macosx version of libopenjpeg-dotnet.dylib with a 32-bit version from libopenmetaverse commit 3731ee4	2012-11-01 03:31:30 +00:00
libsqlite3.dylib	…
libsqlite3_64.so	…
ode.dll	update ode.dll for windows so both 32b and 64b are now version 0.12 (32b	2012-08-04 10:36:50 +01:00
sqlite3.dll	…