Mark Harrah a9ac6b3983 Configurable conflict manager and corresponding documentation on conflictManager, dependencyOverrides, and force(). Fixes #603.		2013-01-11 16:01:31 -05:00
..
jekyll	xsbt-web-plugin moved	2012-12-02 03:19:29 -05:00
main/conscript	0.13 branch for new development	2012-04-13 18:33:00 -04:00
sphinx	Configurable conflict manager and corresponding documentation on conflictManager, dependencyOverrides, and force(). Fixes #603.	2013-01-11 16:01:31 -05:00