diff options
| author | Melanie | 2013-12-07 01:08:49 +0000 |
|---|---|---|
| committer | Melanie | 2013-12-07 01:08:49 +0000 |
| commit | 6d6b9ab791a6a759b2a3a8469569f536b3525894 (patch) | |
| tree | 9b3a1a63f8b6bd4596d11904be04e667747601c7 /OpenSim/Region/ScriptEngine/Shared/AssemblyResolver.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Adding profile partners fix to SQLite and PgSQL drivers (diff) | |
| download | opensim-SC_OLD-6d6b9ab791a6a759b2a3a8469569f536b3525894.zip opensim-SC_OLD-6d6b9ab791a6a759b2a3a8469569f536b3525894.tar.gz opensim-SC_OLD-6d6b9ab791a6a759b2a3a8469569f536b3525894.tar.bz2 opensim-SC_OLD-6d6b9ab791a6a759b2a3a8469569f536b3525894.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/AssemblyResolver.cs')
0 files changed, 0 insertions, 0 deletions