diff options
| author | Melanie | 2012-04-09 21:40:03 +0100 |
|---|---|---|
| committer | Melanie | 2012-04-09 21:40:03 +0100 |
| commit | 67d4f1d66cef2ff51453f113bdaef375004b17c9 (patch) | |
| tree | 975abcb48e2492950ea974567379de88809f57f5 /OpenSim/Framework/Lazy.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Mantis5502 implementation of some of the new constants (diff) | |
| download | opensim-SC-67d4f1d66cef2ff51453f113bdaef375004b17c9.zip opensim-SC-67d4f1d66cef2ff51453f113bdaef375004b17c9.tar.gz opensim-SC-67d4f1d66cef2ff51453f113bdaef375004b17c9.tar.bz2 opensim-SC-67d4f1d66cef2ff51453f113bdaef375004b17c9.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Interfaces/IScriptModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
Diffstat (limited to 'OpenSim/Framework/Lazy.cs')
0 files changed, 0 insertions, 0 deletions