diff options
| author | Melanie | 2010-03-03 02:07:03 +0000 |
|---|---|---|
| committer | Melanie | 2010-03-03 02:07:03 +0000 |
| commit | 028a87fe37002e7a0611f66babf1deee46c83804 (patch) | |
| tree | 387aec499fd60c2012bed8148e6a2ddc847c3d95 /OpenSim/Grid/GridServer.Modules/Resources/GridServer.Modules.addin.xml | |
| parent | Revert "test" (diff) | |
| parent | Fixes Region.Framework tests. Although these tests don't fail, they need to b... (diff) | |
| download | opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.zip opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.tar.gz opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.tar.bz2 opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
This brings careminster on the level of master. To be tested
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Grid/GridServer.Modules/Resources/GridServer.Modules.addin.xml | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/OpenSim/Grid/GridServer.Modules/Resources/GridServer.Modules.addin.xml b/OpenSim/Grid/GridServer.Modules/Resources/GridServer.Modules.addin.xml deleted file mode 100644 index c2c5ac3..0000000 --- a/OpenSim/Grid/GridServer.Modules/Resources/GridServer.Modules.addin.xml +++ /dev/null | |||
| @@ -1,11 +0,0 @@ | |||
| 1 | <Addin id="OpenSim.Grid.GridServer.Modules" version="0.1"> | ||
| 2 | <Runtime> | ||
| 3 | <Import assembly="OpenSim.Grid.GridServer.Modules.dll"/> | ||
| 4 | </Runtime> | ||
| 5 | <Dependencies> | ||
| 6 | <Addin id="OpenSim.Grid.GridServer" version="0.5" /> | ||
| 7 | </Dependencies> | ||
| 8 | <Extension path = "/OpenSim/GridServer"> | ||
| 9 | <Plugin id="GridServerModules" type="OpenSim.Grid.GridServer.Modules.GridServerPlugin" /> | ||
| 10 | </Extension> | ||
| 11 | </Addin> | ||