Melanie b3e99a4d48 Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs		2012-11-08 04:51:00 +00:00
..
BulletSim.dll	BulletSim: update the DLLs and SOs	2012-11-06 18:17:00 -08:00
libBulletSim.so	BulletSim: update the DLLs and SOs	2012-11-06 18:17:00 -08:00
libode-x86_64.so	…
libode.dylib	…
libopenjpeg-dotnet-x86_64.so	…
libopenjpeg-dotnet.dylib	…
libsqlite3.dylib	…
libsqlite3_64.so	…
ode.dll	…
sqlite3.dll	…