Melanie 6ce93b22d1 Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs		2012-10-12 19:05:06 +01:00
..
BulletSim.dll	BulletSim: update the DLLs and SOs	2012-10-11 14:01:35 -07:00
libBulletSim.so	BulletSim: update the DLLs and SOs	2012-10-11 14:01:35 -07:00
libode.so	…
libopenjpeg-dotnet.so	…
libsqlite3.txt	…
libsqlite3_32.so	…
ode.dll	…
sqlite3.dll	…