From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Sat, 20 Dec 2008 17:13:10 +0000 (+0100)
Subject: Merge commit 'origin/platal-0.10.0'
X-Git-Tag: xorg/0.10.1~174
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=47fe1bc45bf78554c0861a083609ec5674e41481;p=platal.git

Merge commit 'origin/platal-0.10.0'

Conflicts:

	core

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

47fe1bc45bf78554c0861a083609ec5674e41481
diff --cc core
index e33bada,f8eaef2..9ca0abd
--- a/core
+++ b/core
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit e33badaa2e54d255a8ef5fc9e33c797349b7ca17
 -Subproject commit f8eaef228101f1873f61c02946c11dd2211ca97b
++Subproject commit 9ca0abdd001bbf5dcda5aaa66b7b2b2073c865b9