From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Sun, 21 Dec 2008 14:50:51 +0000 (+0100)
Subject: Merge commit 'origin/platal-0.10.0'
X-Git-Tag: xorg/0.10.1~170
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=afe36ba2f02db02ff1cf7d6c20fd995c30cc29a6;p=platal.git

Merge commit 'origin/platal-0.10.0'

Conflicts:

	core

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
---

afe36ba2f02db02ff1cf7d6c20fd995c30cc29a6
diff --cc core
index 9ca0abd,a12a0ce..d7dfb18
--- a/core
+++ b/core
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 9ca0abdd001bbf5dcda5aaa66b7b2b2073c865b9
 -Subproject commit a12a0ce3c524c4edabcbb0e872fbc84fc3bad498
++Subproject commit d7dfb18e275c1ed834ea8f0f4001399b0a17ce9f