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/?p=lttv.git;a=commitdiff_plain;h=1b6b471ad884137b6fa2f2fbea1be7da1aa8fe77

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

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

1b6b471ad884137b6fa2f2fbea1be7da1aa8fe77
diff --cc doc/developer/lttng-lttv-compatibility.html
index 44dd9864,194364f7..cbead46e
--- a/doc/developer/lttng-lttv-compatibility.html
+++ b/doc/developer/lttng-lttv-compatibility.html
@@@ -4261,10 -4281,17 +4281,19 @@@ powerpc64, s390, sparc, sparc64.<br
  <td style="vertical-align: top;">
  0.19.7<br>
  0.19.8<br>
+ 0.19.9<br>
+ 0.19.10<br>
  </td>
  <td style="vertical-align: top;">
+ 0.6<br>
+ 0.7<br>
+ 0.8<br>
+ 0.9<br>
+ 0.10<br>
+ 0.11<br>
+ 0.12<br>
 +0.13<br>
 +0.14<br>
  </td>
  <td style="vertical-align: top;">
  obsolete<br>