diff options
| author | Melanie | 2012-11-12 23:27:47 +0000 |
|---|---|---|
| committer | Melanie | 2012-11-12 23:27:47 +0000 |
| commit | 2e0ce70e639391ecec9d63d88c6d8910e3b0ebfc (patch) | |
| tree | 308caeac8741ef507a3f02f41d4403a29d06b06e /Makefile | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Completely remove the IRegionModule interface (diff) | |
| download | opensim-SC_OLD-2e0ce70e639391ecec9d63d88c6d8910e3b0ebfc.zip opensim-SC_OLD-2e0ce70e639391ecec9d63d88c6d8910e3b0ebfc.tar.gz opensim-SC_OLD-2e0ce70e639391ecec9d63d88c6d8910e3b0ebfc.tar.bz2 opensim-SC_OLD-2e0ce70e639391ecec9d63d88c6d8910e3b0ebfc.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
OpenSim/Region/Framework/ModuleLoader.cs
OpenSim/Region/Framework/Scenes/SceneManager.cs
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions