From: Vincent Zanotti <vincent.zanotti@m4x.org>
Date: Wed, 17 Jun 2009 21:02:31 +0000 (+0200)
Subject: Merge branch 'platal-0.10.0'
X-Git-Tag: xorg/0.10.1~49
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=c3c43c0ebe734e2b43b5d5fdb6010d08358bc34b;p=platal.git

Merge branch 'platal-0.10.0'

Signed-off-by: Vincent Zanotti <vincent.zanotti@m4x.org>
---

c3c43c0ebe734e2b43b5d5fdb6010d08358bc34b
diff --cc core
index 92292d0,2b1ac5a..31ac496
--- a/core
+++ b/core
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 92292d0ea68640cd0f2255a575036c9343f5de91
 -Subproject commit 2b1ac5abd3eafffdc01beb88a90ca0ba88c6ad18
++Subproject commit 31ac496f284cd21164e05d1472ad1ceca9fe1095