Alistair Johnson 77b536b25f Merge branch '1.x' of https://github.com/BennyHill/sbt into fix/3042 ... Conflicts: main/src/main/scala/sbt/internal/BuildDef.scala main/src/main/scala/sbt/internal/EvaluateConfigurations.scala		2018-04-04 18:30:56 +02:00
..
src	Merge branch '1.x' of https://github.com/BennyHill/sbt into fix/3042	2018-04-04 18:30:56 +02:00
NOTICE	Add, configure & enforce file headers	2017-10-05 09:03:40 +01:00