Eugene Yokota 3db0e09b33 Merge branch '1.1.x' into wip/1.1.1 ... # Conflicts: # main/src/main/scala/sbt/internal/CommandExchange.scala # main/src/main/scala/sbt/internal/ConsoleProject.scala # notes/1.0.2/sample.md # notes/1.1.1/sample.md # notes/sample.md # sbt/src/test/scala/sbt/ServerSpec.scala		2018-02-09 23:55:23 -05:00
..
src	Merge branch '1.1.x' into wip/1.1.1	2018-02-09 23:55:23 -05:00
NOTICE	Add, configure & enforce file headers	2017-10-05 09:03:40 +01:00