OpenSimMirror/bin/config-include
Dan Lake 7210b7f517 Merge branch 'master' of git://opensimulator.org/git/opensim into dev
Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-03-07 15:57:31 -08:00
..
storage
CenomeCache.ini.example
FlotsamCache.ini.example
Grid.ini
GridCommon.ini.example
GridHypergrid.ini WARNING: simulator config var change! This affects only system-facing configs. Nothing to do if you follow the rules of not messing with Grid.ini and GridHypergrid.ini. 2010-12-27 15:25:08 -08:00
HyperSimianGrid.ini
SimianGrid.ini
Standalone.ini
StandaloneCommon.ini.example
StandaloneHypergrid.ini