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-x86_64.so	…
libode.dylib	…
libopenjpeg-dotnet-x86_64.so	Update libopenjpeg libraries used by libopenmetaverse back up to 1.5, this time using lkalif's linux libraries built against a much earlier libc (2.7)	2012-09-20 01:26:35 +01:00
libopenjpeg-dotnet.dylib	…
libsqlite3.dylib	…
libsqlite3_64.so	…
ode.dll	…
sqlite3.dll	…