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.dylib	BulletSim: update lib32/libBulletSim.dylib to current BulletSim C++ API.	2013-10-18 09:15:08 -07:00
libBulletSim.so	BulletSim: restore collision flags when clear collision cache.	2013-10-26 21:30:51 -07:00
libode.so	change linux 32bit libode.so to ode version 0.12	2012-07-10 02:24:09 +02:00
libopenjpeg-dotnet.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
libsqlite3.txt	Move other sqlite and ode 32-bit and 64-bit libraries into lib32 or lib64 as appropriate.	2012-02-25 03:25:56 +00:00
libsqlite3_32.so	Move other sqlite and ode 32-bit and 64-bit libraries into lib32 or lib64 as appropriate.	2012-02-25 03:25:56 +00:00
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	…