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	…
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	…
sqlite3.dll	…