Merge branch 'master' into easing-consts

Starzu · Starzu · commit 78af322f73f2 · 2016-02-15T13:32:43.000+01:00
diff --git a/build.sbt b/build.sbt
@@ -16,7 +16,7 @@ scalacOptions in ThisBuild ++= Seq(
 )
 
 libraryDependencies ++= Seq(
-  "org.scala-js" %%% "scalajs-dom" % "0.8.2",
+  "org.scala-js" %%% "scalajs-dom" % "0.9.0",
   "org.scalatest" %%% "scalatest" % "3.0.0-M15" % Test,
   "com.lihaoyi" %%% "scalatags" % "0.5.4" % Test
 )
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,3 +1,3 @@
 logLevel := Level.Warn
 
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.6")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.7")

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ scalacOptions in ThisBuild ++= Seq(`
`16`	`16`	`)`
`17`	`17`
`18`	`18`	`libraryDependencies ++= Seq(`
`19`		`- "org.scala-js" %%% "scalajs-dom" % "0.8.2",`
	`19`	`+ "org.scala-js" %%% "scalajs-dom" % "0.9.0",`
`20`	`20`	`"org.scalatest" %%% "scalatest" % "3.0.0-M15" % Test,`
`21`	`21`	`"com.lihaoyi" %%% "scalatags" % "0.5.4" % Test`
`22`	`22`	`)`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`logLevel := Level.Warn`
`2`	`2`
`3`		`-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.6")`
	`3`	`+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.7")`