# HG changeset patch
# User rougeronj
# Date 1421968209 -3600
# Node ID 0386fb9efe27b377a5a21af805da138f6f2ddc8d
# Parent 13d9a532a0a7becd03989f4b9214ccd12da8213e# Parent b5697bcdbaffd1d52ea785e6276bc70422bf1286
Merge with b5697bcdbaffd1d52ea785e6276bc70422bf1286
diff -r 13d9a532a0a7 -r 0386fb9efe27 client/annotviz/app/annotstimeline.html
--- a/client/annotviz/app/annotstimeline.html Thu Jan 22 23:58:11 2015 +0100
+++ b/client/annotviz/app/annotstimeline.html Fri Jan 23 00:10:09 2015 +0100
@@ -14,7 +14,7 @@
- Piano Roll vertical
+ annotation timeline
@@ -26,6 +26,7 @@