Merge remote-tracking branch 'origin/master'

This commit is contained in:
Roland 2012-10-15 22:41:25 +02:00
commit 69ff6db394

View file

@ -655,7 +655,7 @@ object Dependencies {
// Compile
val camelCore = "org.apache.camel" % "camel-core" % "2.10.0" exclude("org.slf4j", "slf4j-api") // ApacheV2
val config = "com.typesafe" % "config" % "0.6.0" // ApacheV2
val config = "com.typesafe" % "config" % "1.0.0" // ApacheV2
val netty = "io.netty" % "netty" % "3.5.8.Final" // ApacheV2
val protobuf = "com.google.protobuf" % "protobuf-java" % "2.4.1" // New BSD
val scalaStm = "org.scala-tools" % "scala-stm" % "0.6" cross CrossVersion.full // Modified BSD (Scala)