Melanie 3a495ccd56 Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs		2013-01-10 01:38:03 +00:00
..
BulletSim.dll	BulletSim: update DLLs and SOs with better debugging output.	2013-01-06 14:01:15 -08:00
libBulletSim.so	BulletSim: update DLLs and SOs with better debugging output.	2013-01-06 14:01:15 -08:00
libode.so	…
libopenjpeg-dotnet.so	…
libsqlite3.txt	…
libsqlite3_32.so	…
ode.dll	…
sqlite3.dll	…