diff options
| author | teravus | 2012-11-15 10:05:16 -0500 |
|---|---|---|
| committer | teravus | 2012-11-15 10:05:16 -0500 |
| commit | e9153e1d1aae50024d8cd05fe14a9bce34343a0e (patch) | |
| tree | bc111d34f95a26b99c7e34d9e495dc14d1802cc3 /OpenSim/Region/RegionCombinerModule/Resources/RegionCombinerModule.addin.xml | |
| parent | Merge master into teravuswork (diff) | |
| download | opensim-SC-e9153e1d1aae50024d8cd05fe14a9bce34343a0e.zip opensim-SC-e9153e1d1aae50024d8cd05fe14a9bce34343a0e.tar.gz opensim-SC-e9153e1d1aae50024d8cd05fe14a9bce34343a0e.tar.bz2 opensim-SC-e9153e1d1aae50024d8cd05fe14a9bce34343a0e.tar.xz | |
Revert "Merge master into teravuswork", it should have been avination, not master.
This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing
changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64.
Diffstat (limited to 'OpenSim/Region/RegionCombinerModule/Resources/RegionCombinerModule.addin.xml')
| -rw-r--r-- | OpenSim/Region/RegionCombinerModule/Resources/RegionCombinerModule.addin.xml | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/OpenSim/Region/RegionCombinerModule/Resources/RegionCombinerModule.addin.xml b/OpenSim/Region/RegionCombinerModule/Resources/RegionCombinerModule.addin.xml deleted file mode 100644 index 13cb8b6..0000000 --- a/OpenSim/Region/RegionCombinerModule/Resources/RegionCombinerModule.addin.xml +++ /dev/null | |||
| @@ -1,14 +0,0 @@ | |||
| 1 | <Addin id="OpenSim.RegionModules.RegionCombinerModule" version="0.3"> | ||
| 2 | <Runtime> | ||
| 3 | <Import assembly="OpenSim.Region.RegionCombinerModule.dll"/> | ||
| 4 | </Runtime> | ||
| 5 | |||
| 6 | <Dependencies> | ||
| 7 | <Addin id="OpenSim" version="0.5" /> | ||
| 8 | </Dependencies> | ||
| 9 | |||
| 10 | <Extension path = "/OpenSim/RegionModules"> | ||
| 11 | <RegionModule id="RegionCombinerModule" type="OpenSim.Region.RegionCombinerModule.RegionCombinerModule" /> | ||
| 12 | </Extension> | ||
| 13 | |||
| 14 | </Addin> | ||