Merge branch 'master' into 2.0

3 files changed, 5 insertions, 5 deletions

diff --git a/README.md b/README.md
index 17897ed..5097c8a 100644
--- a/README.md
+++ b/README.md
@@ -9,13 +9,13 @@ For a short guide on how to use flow see the file "documentation/basics.md", acc
 
 Flow is built and its examples run with SBT. To get started, include a dependency to flow in your project:
 
-    libraryDependencies += "com.github.jodersky" %% "flow" % "1.1.0"
+    libraryDependencies += "com.github.jodersky" %% "flow" % "1.2.0"
 
 ATTENTION: flow uses native libraries to back serial communication, therefore before you can run any application depending on flow you must include flow's native library! To do so, you have two options.
 
 1.  The easy way: add a second dependency to your project: (this dependency is not available on maven, please run ```flow-pack/publishLocal``` before)
         
-        libraryDependencies += "com.github.jodersky" %% "flow-pack" % "1.1.0"
+        libraryDependencies += "com.github.jodersky" %% "flow-pack" % "1.2.0"
         
     This will add a jar to your classpath containing native libraries for various platforms. At run time, the correct library for the current platform is selected, extracted and loaded. This solution enables running applications seamlessly, as if they were pure JVM applications. However, since the JVM does not enable full determination of the current platform (only OS and rough architecture are known), only a couple of platforms are supported through this solution. Currently, these are given in the table below.
 
@@ -39,7 +39,7 @@ It is recomended that you use the first option only for testing purposes or end-
 ## Examples
 Examples on flow's usage are located in the flow-samples directory. The examples may be run by switching to the corresponding project in sbt: `project flow-samples-<sample_name>` and typing `run`. Be sure to connect a serial device before running an example.
 
-Since flow integrates into the Akka-IO framework, a good resource on its general design is the framework's documentation at http://doc.akka.io/docs/akka/2.2.3/scala/io.html
+Since flow integrates into the Akka-IO framework, a good resource on its general design is the framework's documentation at http://doc.akka.io/docs/akka/2.3.0/scala/io.html
 
 ## Native side
 Since hardware is involved in serial communication, a Scala-only solution is not possible. Nevertherless, the native code is kept simple and minimalistic with the burden of dealing with threads left to Scala. The code aims to be POSIX compliant and therefore easily portable.
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index f7bd333..7115ba6 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -2,7 +2,7 @@ import sbt._
 
 object Dependencies {
 
-  lazy val akkaActor = "com.typesafe.akka" %% "akka-actor" % "2.2.3"
+  lazy val akkaActor = "com.typesafe.akka" %% "akka-actor" % "2.3.0"
   
   lazy val ioCore = "com.github.scala-incubator.io" %% "scala-io-core" % "0.4.2"
   lazy val ioFile = "com.github.scala-incubator.io" %% "scala-io-file" % "0.4.2"
diff --git a/project/FlowBuild.scala b/project/FlowBuild.scala
index e12d9b8..5638243 100644
--- a/project/FlowBuild.scala
+++ b/project/FlowBuild.scala
@@ -7,7 +7,7 @@ import NativePackKeys._
 object FlowBuild extends Build {
   val Organization = "com.github.jodersky"
   val ScalaVersion = "2.10.3"
-  val Version = "1.1.0" //version of flow library
+  val Version = "1.2.0" //version of flow library
   val NativeMajorVersion = 2 //major version of native API
   val NativeMinorVersionPosix = 0 //minor version of native posix implementation
   val NativeVersionPosix = NativeMajorVersion + "." + NativeMinorVersionPosix