From: Pierre-Marc Fournier <pierre-marc.fournier@polymtl.ca>
Date: Mon, 26 Apr 2010 14:13:15 +0000 (-0400)
Subject: Merge branch 'master' of git://git.dorsal.polymtl.ca/git/liblttngtrace
X-Git-Tag: 0.12.32~14
X-Git-Url: https://git.lttng.org/?a=commitdiff_plain;h=9bf3752a47cedeb96104e465e94ccea90416707f;hp=72984157670b34f39c04134a4188bed37559095d;p=lttv.git

Merge branch 'master' of git://git.dorsal.polymtl.ca/git/liblttngtrace
---

diff --git a/LTTngManual.html b/LTTngManual.html
index 60e6dff9..020a7270 100644
--- a/LTTngManual.html
+++ b/LTTngManual.html
@@ -174,7 +174,7 @@ gtk 2.4 or better development libraries
   (Fedora : gtk2, gtk2-devel)
   note : For Fedora users : this might require at least core 3 from Fedora,
   or you might have to compile your own GTK2 library.
-glib 2.4 or better development libraries
+glib 2.16 or better development libraries
   (Debian : libglib2.0-0, libglib2.0-dev)
   (Fedora : glib2, glib2-devel)
 libpopt development libraries
diff --git a/README b/README
index 6cf451f4..bd7074a9 100644
--- a/README
+++ b/README
@@ -15,7 +15,7 @@ gtk 2.4 or better development libraries
   (Fedora : gtk2, gtk2-devel)
   note : For Fedora users : this might require at least core 3 from Fedora,
   or you might have to compile your own GTK2 library.
-glib 2.4 or better development libraries
+glib 2.16 or better development libraries
   (Debian : libglib2.0-0, libglib2.0-dev)
   (Fedora : glib2, glib2-devel)
 libpopt development libraries
diff --git a/doc/developer/lttng-lttv-compatibility.html b/doc/developer/lttng-lttv-compatibility.html
index 147d3623..f3ae7a43 100644
--- a/doc/developer/lttng-lttv-compatibility.html
+++ b/doc/developer/lttng-lttv-compatibility.html
@@ -3830,6 +3830,7 @@ powerpc64, s390, sparc, sparc64.<br>
 0.209<br>
 0.210<br>
 0.211<br>
+0.212<br>
 </td>
 <td style="vertical-align: top;">
 0.76<br>
@@ -3916,6 +3917,7 @@ LTTng 0.209 fixes a module build issue.<br>
 LTTng 0.210 reverts some powerpc-specific instrumentation from mainline that
 clashes with arch-agnostic LTTng instrumentation.<br>
 LTTng 0.211 fixes build menu Kconfig dependencies.<br>
+LTTng 0.212 adds more complete MIPS syscall instrumentation.<br>
 </td>
 <td style="vertical-align: top;">
 </td>