aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/RegionCombinerModule/RegionCombinerPermissionModule.cs (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge of ubitworkvarnew with opensim/master as of 20150905.Robert Adams2015-09-081-2/+2
* Moved RegionCombinerModule to OptionalModules. Removed it as its own top-leve...Diva Canto2015-09-041-0/+270