Files
opensim/bin
Melanie 24235006f4 Merge branch 'master' into bigmerge
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
	OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
	OpenSim/Region/CoreModules/LightShare/LightShareModule.cs
	OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
2011-11-04 01:18:37 +00:00
..
2010-12-09 03:10:48 +00:00
2011-03-22 16:42:12 -04:00
2011-03-22 16:42:12 -04:00
2011-03-18 12:12:08 -04:00
2008-12-05 12:42:32 +00:00
2008-12-05 12:42:32 +00:00
2009-08-10 08:14:57 -07:00