Mark Harrah a9ac6b3983 Configurable conflict manager and corresponding documentation on conflictManager, dependencyOverrides, and force(). Fixes #603.		2013-01-11 16:01:31 -05:00
..
actions/src	move Eval test to correct location	2012-12-19 10:17:56 -05:00
command/src/main/scala/sbt	use proper separator in command tab completion	2013-01-03 11:37:40 -05:00
settings/src	when looking for the enclosing val definition in definingValName, allow the macro to be in an expression	2013-01-10 16:06:12 -05:00
src	Configurable conflict manager and corresponding documentation on conflictManager, dependencyOverrides, and force(). Fixes #603.	2013-01-11 16:01:31 -05:00
NOTICE	fix component name in main notice	2010-09-21 22:00:11 -04:00