From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Mon, 5 Jan 2009 20:18:59 +0000 (+0100)
Subject: Merge commit 'origin/platal-0.10.0'
X-Git-Tag: xorg/0.10.1~158
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=a415be4f1460f3702f9c07667caae34b7489d429;p=platal.git

Merge commit 'origin/platal-0.10.0'

Conflicts:

	core

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

a415be4f1460f3702f9c07667caae34b7489d429
diff --cc core
index 35fff9b,adc69ce..fed2b6d
--- a/core
+++ b/core
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 35fff9b04585817e74f4709f36b70d959ce3224c
 -Subproject commit adc69ced9c75421c5ee596fbd0a3426fffb9940c
++Subproject commit fed2b6d36f59c4542bd8d6fc0a137342c785d06b