From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Thu, 18 Dec 2008 22:32:12 +0000 (+0100)
Subject: Merge commit 'origin/platal-0.10.0'
X-Git-Tag: xorg/0.10.1~175
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=49bbddef42c7f9f4b356784141e3985c111778b6;p=platal.git

Merge commit 'origin/platal-0.10.0'

Conflicts:

	core

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

49bbddef42c7f9f4b356784141e3985c111778b6
diff --cc core
index eec9962,4f67da2..e33bada
--- a/core
+++ b/core
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit eec996233a443d9d024786583c0370a54d639dde
 -Subproject commit 4f67da27edb0f631a7af1ccf5aa6e7ead84332dc
++Subproject commit e33badaa2e54d255a8ef5fc9e33c797349b7ca17