diff options
| author | = <=> | 2014-05-28 16:00:19 +0200 |
|---|---|---|
| committer | = <=> | 2014-05-28 16:00:19 +0200 |
| commit | cf090f79b912cd879e23de394885f5e0ce210217 (patch) | |
| tree | 6c8a9d2dd9e61a11455f90888f975a0f443e0ffa | |
| parent | de4c6f15419a664e38cfde4a4f7b9a2364c6768b (diff) | |
| parent | 817cc1750df9064dba5ebe090aea43daded02120 (diff) | |
| download | akka-serial-cf090f79b912cd879e23de394885f5e0ce210217.tar.gz akka-serial-cf090f79b912cd879e23de394885f5e0ce210217.tar.bz2 akka-serial-cf090f79b912cd879e23de394885f5e0ce210217.zip | |
Merge branch 'photex-master'
| -rw-r--r-- | flow-native/src/flow.h | 2 | ||||
| -rw-r--r-- | project/Dependencies.scala | 7 | ||||
| -rw-r--r-- | project/FlowBuild.scala | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/flow-native/src/flow.h b/flow-native/src/flow.h index bda527c..44e2a47 100644 --- a/flow-native/src/flow.h +++ b/flow-native/src/flow.h @@ -1,7 +1,7 @@ #ifndef FLOW_H #define FLOW_H -#ifdef _cplusplus +#ifdef __cplusplus extern "C" { #endif diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 5b9c0e1..6f585fd 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -2,9 +2,8 @@ import sbt._ object Dependencies { - lazy val akkaActor = "com.typesafe.akka" %% "akka-actor" % "2.3.2" - - lazy val ioCore = "com.github.scala-incubator.io" %% "scala-io-file" % "0.4.2" - lazy val ioFile = "com.github.scala-incubator.io" %% "scala-io-file" % "0.4.2" + lazy val akkaActor = "com.typesafe.akka" %% "akka-actor" % "2.3.3" + lazy val ioCore = "com.github.scala-incubator.io" %% "scala-io-core" % "0.4.3" + lazy val ioFile = "com.github.scala-incubator.io" %% "scala-io-file" % "0.4.3" } diff --git a/project/FlowBuild.scala b/project/FlowBuild.scala index f4bc5dd..2b59910 100644 --- a/project/FlowBuild.scala +++ b/project/FlowBuild.scala @@ -7,7 +7,7 @@ import NativeKeys._ object FlowBuild extends Build { val Organization = "com.github.jodersky" - val ScalaVersion = "2.10.4" + val ScalaVersion = "2.11.1" val Version = "2.0.1" |