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