Eugene Yokota 5b1c33dd6e Added conflict report and unit tests		2014-03-22 02:47:11 -04:00
..
actions/src	SI-7788 Adapt to renamed implict Predef.conforms	2014-02-21 22:14:13 +01:00
command/src/main/scala/sbt	Expand aliases instead of evaluating directly.	2013-11-24 15:19:24 -05:00
settings/src	Merge pull request #1115 from metasim/Structure-docs	2014-03-03 14:16:21 -05:00
src	Added conflict report and unit tests	2014-03-22 02:47:11 -04:00
NOTICE	fix component name in main notice	2010-09-21 22:00:11 -04:00