Merge branch 'master' of git.lttng.org:/home/git/lttv

Conflicts:
	doc/developer/lttng-lttv-compatibility.html

diff --git a/doc/developer/lttng-lttv-compatibility.html b/doc/developer/lttng-lttv-compatibility.html
index 194364f731d714cdf015e1ecfa2b9d23831252bd..cbead46e8377912c587ea0a6b7fc90ac21ad1252 100644 (file)
--- a/doc/developer/lttng-lttv-compatibility.html
+++ b/doc/developer/lttng-lttv-compatibility.html
@@ -4292,6 +4292,8 @@ powerpc64, s390, sparc, sparc64.<br>
 0.10<br>
 0.11<br>
 0.12<br>
+0.13<br>
+0.14<br>
 </td>
 <td style="vertical-align: top;">
 obsolete<br>