Merge branch '1.1.x' into 1.2.x

# Conflicts: # build.sbt
freechipsproject · Mar 4, 2018 · 93c8220 · 93c8220
2 parents 1a0ce6c + b2a8acc
commit 93c8220
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/build.sbt b/build.sbt
@@ -43,7 +43,7 @@ scalaVersion := "2.11.12"
 crossScalaVersions := Seq("2.11.12", "2.12.4")
 
 // Provide a managed dependency on X if -DXVersion="" is supplied on the command line.
-// The following are the default development versions, not the "release" versions.
+// The following are the release versions, not the default development versions.
 val defaultVersions = Map(
   "chisel3" -> "3.1-RELEASE-SNAPSHOT",
   "firrtl" -> "1.1-RELEASE-SNAPSHOT",
@@ -92,7 +92,6 @@ publishTo := {
   }
 }
 
-
 resolvers ++= Seq(
   Resolver.sonatypeRepo("snapshots"),
   Resolver.sonatypeRepo("releases")