Update version to v1.2.6

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/ChangeLog b/ChangeLog
index 569b0a2fde3f883fe972a55e0a93641f15600c45..6761a4f7fa843479169eaca179e82ed5365ed53d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-06-06 babeltrace 1.2.6 (National Yo-Yo Day)
+       * Docs: change --clock-raw to --clock-cycles
+       * Fix: out-of-tree dist fails to find test traces
+       * Fix running tests out of tree
+
 2015-11-10 babeltrace 1.2.5
        * Fix: Confusion between stream and stream class IDs
        * Fix: babeltrace-log packet seek

diff --git a/configure.ac b/configure.ac
index 08581abe91c96b832b25c825897b8589f91d9d14..1ee1ab61e921e0ff4b31f0823cace97fb9a8e77c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.50])
-AC_INIT([babeltrace],[1.2.5],[jeremie.galarneau@efficios.com],[],[https://diamon.org/babeltrace])
+AC_INIT([babeltrace],[1.2.6],[jeremie.galarneau@efficios.com],[],[https://diamon.org/babeltrace])
 
 # Following the numbering scheme proposed by libtool for the library version
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html