diff options
| author | Melanie | 2013-06-23 01:48:57 +0100 |
|---|---|---|
| committer | Melanie | 2013-06-23 01:48:57 +0100 |
| commit | 24a4367fc2ff9456ec165db14a646dba977550a0 (patch) | |
| tree | f6880151d7b5e4749685dc4f4cc5d1130a9544e7 /OpenSim/Framework/Servers | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Fix prim locking to behave like SL (diff) | |
| download | opensim-SC_OLD-24a4367fc2ff9456ec165db14a646dba977550a0.zip opensim-SC_OLD-24a4367fc2ff9456ec165db14a646dba977550a0.tar.gz opensim-SC_OLD-24a4367fc2ff9456ec165db14a646dba977550a0.tar.bz2 opensim-SC_OLD-24a4367fc2ff9456ec165db14a646dba977550a0.tar.xz | |
Merge branch 'avination-current' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
Diffstat (limited to 'OpenSim/Framework/Servers')
0 files changed, 0 insertions, 0 deletions