From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Tue, 28 Jun 2011 22:50:53 +0000 (-0400)
Subject: Merge branch 'master' of git.lttng.org:/home/git/lttv
X-Git-Tag: v1.5-beta1~109
X-Git-Url: http://git.liburcu.org/?a=commitdiff_plain;h=1b6b471ad884137b6fa2f2fbea1be7da1aa8fe77;hp=ad37d3f91b43021c3fcf9f7723a399bc0cf27908;p=lttv.git

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 194364f7..cbead46e 100644
--- 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>