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
..
ContrabandConfig.scala	Adjust to upstream changes	2017-07-16 00:51:49 -04:00
Dependencies.scala	Zinc 1.1.1, LM 1.1.3, IO 1.1.4	2018-02-08 01:06:09 -05:00
Docs.scala	sbt 1.0.0-RC2	2017-07-20 06:56:37 +01:00
NightlyPlugin.scala	be 2.13 friendly	2017-08-12 07:35:26 -07:00
PublishBinPlugin.scala	Add back, re-configure & re-enable Scalafmt	2017-08-10 16:35:23 +01:00
Release.scala	Upgrade the build to sbt 1.0.0-M5	2017-05-11 09:44:42 +01:00
SbtLauncherPlugin.scala	sbt 1.0.0-RC2	2017-07-20 06:56:37 +01:00
Scripted.scala	Merge pull request #3897 from dwijnand/misc	2018-01-30 13:02:55 +00:00
SiteMap.scala	Change modifiedTime definitions	2017-12-22 01:55:37 +01:00
StatusPlugin.scala	Apply Scalafmt formatting	2017-04-21 04:48:31 -04:00
Sxr.scala	sbt 1.0.0-RC2	2017-07-20 06:56:37 +01:00
Transform.scala	Upgrade the build to sbt 1.0.0-M5	2017-05-11 09:44:42 +01:00
Util.scala	Merge pull request #3854 from sbt/1.1.x	2018-01-08 11:16:26 +00:00
build.properties	Upgrade to sbt 1.1.0	2018-01-10 16:08:13 +00:00
plugins.sbt	Add, configure & enforce sbt-whitesource	2018-01-11 14:13:21 +00:00