Melanie f8603a215d Merge branch 'master' into careminster ... Conflicts: OpenSim/Framework/IClientAPI.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs		2012-08-23 01:41:47 +01:00
..
BulletSim.dll	BulletSim: update DLLs and SOs to eliminate terrain update crash which manifested itself on Linux.	2012-08-21 20:55:48 -07:00
libBulletSim.so	BulletSim: update DLLs and SOs to eliminate terrain update crash which manifested itself on Linux.	2012-08-21 20:55:48 -07:00
libode.so	…
libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686.so	…
libopenjpeg-dotnet-2.1.3.0-dotnet-1.so	…
libsqlite3.txt	…
libsqlite3_32.so	…
ode.dll	…
sqlite3.dll	…