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	…
libopenjpeg-dotnet.so	…
libsqlite3.txt	…
libsqlite3_32.so	…
ode.dll	…
sqlite3.dll	…