From: Raphaël Barrois <raphael.barrois@polytechnique.org>
Date: Wed, 14 Nov 2012 23:34:50 +0000 (+0100)
Subject: Merge xorg/maint into xorg/master
X-Git-Tag: xorg/1.1.6~1
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=57429ea447195202064ba5a3958e8844939059e9;p=platal.git

Merge xorg/maint into xorg/master

Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
---

57429ea447195202064ba5a3958e8844939059e9
diff --cc core
index d3e8ac4,bce0d8c..ee47c43
--- a/core
+++ b/core
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit d3e8ac41247fb278285704bd8bf819a5275e5aca
 -Subproject commit bce0d8c7608b7dd361810d4143792db5affaf2ca
++Subproject commit ee47c4357d535e26a408f14e1144a3f8ed85528f