Melanie 90ad98370a Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs		2012-08-16 02:46:48 +01:00
..
BulletSim.dll	BulletSim: update DLLs and SOs	2012-08-15 12:08:29 -07:00
libBulletSim.so	BulletSim: update DLLs and SOs	2012-08-15 12:08:29 -07:00
libode-x86_64.so	…
libode.dylib	…
libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64.so	…
libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib	…
libsqlite3.dylib	…
libsqlite3_64.so	…
ode.dll	…
sqlite3.dll	…