Files
opensim/OpenSim/Services/Interfaces
Robert Adams fd045d520e Merge branch 'master' into varregion
Conflicts:
	OpenSim/Framework/Constants.cs
	OpenSim/Framework/RegionInfo.cs
	OpenSim/Services/GridService/GridService.cs
	OpenSim/Services/Interfaces/IGridService.cs
Most conflicts had to do with Util routines not in master branch yet.
2014-01-04 08:57:51 -08:00
..
2013-03-18 22:56:17 +00:00
2012-10-01 15:55:24 -07:00
2013-12-06 16:01:29 -08:00