Merge xorg/maint into xorg/master
authorRaphaël Barrois <raphael.barrois@polytechnique.org>
Wed, 14 Nov 2012 23:34:50 +0000 (00:34 +0100)
committerRaphaël Barrois <raphael.barrois@polytechnique.org>
Wed, 14 Nov 2012 23:34:50 +0000 (00:34 +0100)
Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
1  2 
core

diff --cc core
--- 1/core
--- 2/core
+++ b/core
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit d3e8ac41247fb278285704bd8bf819a5275e5aca
 -Subproject commit bce0d8c7608b7dd361810d4143792db5affaf2ca
++Subproject commit ee47c4357d535e26a408f14e1144a3f8ed85528f