X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=ChangeLog;h=6761a4f7fa843479169eaca179e82ed5365ed53d;hb=refs%2Fheads%2Fstable-1.2;hp=569b0a2fde3f883fe972a55e0a93641f15600c45;hpb=ed927c1f1107a42cab7a1fdea7a7f7ff9d8f3062;p=babeltrace.git

diff --git a/ChangeLog b/ChangeLog
index 569b0a2f..6761a4f7 100644
--- 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