diff options
| author | Melanie | 2012-08-31 01:32:18 +0100 |
|---|---|---|
| committer | Melanie | 2012-08-31 01:32:18 +0100 |
| commit | 1b15144208d925bf1fe6c545616b533faf8945ea (patch) | |
| tree | a7720bb8c2ddcdc1470cf991e26c62b2b1a46be9 /bin/Ode.NET.dll | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | Replace SendBannedUserList with Avination's version. Untested in core. Not ev... (diff) | |
| download | opensim-SC-1b15144208d925bf1fe6c545616b533faf8945ea.zip opensim-SC-1b15144208d925bf1fe6c545616b533faf8945ea.tar.gz opensim-SC-1b15144208d925bf1fe6c545616b533faf8945ea.tar.bz2 opensim-SC-1b15144208d925bf1fe6c545616b533faf8945ea.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
Diffstat (limited to 'bin/Ode.NET.dll')
0 files changed, 0 insertions, 0 deletions