diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2011-02-28 11:26:09 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-02-28 11:26:09 +1000 |
| commit | c2207d11f243900bc2f641e08d80da63d84e97a8 (patch) | |
| tree | 12151d996cd78be201e0c8ff51e4e92235f18ab0 /Xext/Makefile.am | |
| parent | 00779932de861bf7ac8c625802f1afed75d01b6f (diff) | |
| parent | 579ee8f5d84c3a523b7b3e3941eabb226d1d19e2 (diff) | |
Merge branch 'next' into for-keith
Conflicts:
dix/devices.c
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'Xext/Makefile.am')
0 files changed, 0 insertions, 0 deletions