Merge branch 'master' into hwacha

2013-11-14 16:03:55 -08:00
parent 36e715a797 c137cf1a46
commit e50c5180cd
6 changed files with 6 additions and 5 deletions
--- a/project/build.scala
+++ b/project/build.scala
@ -13,6 +13,7 @@ object BuildSettings extends Build {
    organization := buildOrganization,
    version      := buildVersion,
    scalaVersion := buildScalaVersion,
+    parallelExecution in Global := false,
    traceLevel   := 15,
    scalacOptions ++= Seq("-deprecation","-unchecked"),
    libraryDependencies ++= Seq("org.scala-lang" % "scala-reflect" % scalaVersion.value)