From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Thu, 7 Apr 2011 20:18:25 +0000 (+0200)
Subject: Merge branch 'xorg/maint' into xorg/master
X-Git-Tag: xorg/1.1.1~115
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=1e7aeba246f8a66530e8d4108c7b14bd68a6dc02;p=platal.git

Merge branch 'xorg/maint' into xorg/master

Conflicts:
	core

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

1e7aeba246f8a66530e8d4108c7b14bd68a6dc02
diff --cc core
index 8dd67de,cab6c1c..13cec5a
--- a/core
+++ b/core
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 8dd67de33d8b729b3ff0f5aae6de1dbad9f3f30d
 -Subproject commit cab6c1c15dfa75c04b433447e608edb59171c376
++Subproject commit 13cec5adcabc015959a87a75ef67cc354242a6bd