Merge branch 'develop' of github.com:Spirals-Team/powerapi into develop

te fusion est
rouvoy · Nov 12, 2014 · e92b15a · e92b15a
2 parents 39ad782 + 060cae9
commit e92b15a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -4,7 +4,6 @@
 
 # activator specific
 activator*
-project
 
 # sbt specific
 .history/

diff --git a/build.sbt b/build.sbt
@@ -10,3 +10,5 @@ libraryDependencies ++= Seq(
   "com.typesafe.akka" %% "akka-testkit" % "2.3.6" % "test",
   "org.scalatest" %% "scalatest" % "2.2.2" % "test"
 )
+
+instrumentSettings
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -0,0 +1,3 @@
+resolvers += Classpaths.sbtPluginReleases
+
+addSbtPlugin("org.scoverage" %% "sbt-scoverage" % "0.99.11")
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		resolvers += Classpaths.sbtPluginReleases

		addSbtPlugin("org.scoverage" %% "sbt-scoverage" % "0.99.11")