Melanie fc5711fa7a Merge commit '8bf0a9f85dda4b1831630b65620d5c6868196c11' into careminster ... Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs		2013-01-16 01:11:20 +00:00
..
BulletSim.dll	…
libBulletSim.so	…
libode.so	…
libopenjpeg-dotnet.so	…
libsqlite3.txt	…
libsqlite3_32.so	…
ode.dll	…
sqlite3.dll	…