Merge branch 'release' into dev

hove-io · Aug 12, 2014 · a8a71fa · a8a71fa
2 parents ff62536 + e30d063
commit a8a71fa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+navitia2 (0.101.2) unstable; urgency=low
+
+  * Kraken: Fix a bug in path building
+
+ -- Vincent Lara <vincent.lara@canaltp.fr>  Mon, 12 Aug 2014 11:44:13 +0100
+
 navitia2 (0.101.1) unstable; urgency=low
 
   * Kraken: Add routing dependency to pb_lib

diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
@@ -13,7 +13,7 @@ endif()
 
 SET(KRAKEN_VERSION_MAJOR 0)
 SET(KRAKEN_VERSION_MINOR 101)
-SET(KRAKEN_VERSION_PATCH 1)
+SET(KRAKEN_VERSION_PATCH 2)
 
 IF(NOT CMAKE_BUILD_TYPE)
    SET(CMAKE_BUILD_TYPE Debug)