Melanie 2cb824d3fc Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.cs		2012-12-07 03:49:04 +00:00
..
BulletSim.dll	…
libBulletSim.so	…
libode.so	…
libopenjpeg-dotnet.so	…
libsqlite3.txt	…
libsqlite3_32.so	…
ode.dll	…
sqlite3.dll	…