Peter Hutterer
d7aef3f663
Merge branch 'master' into xi2
Conflicts:
Xext/geext.c
Xi/chdevcur.c
Xi/extgrbdev.c
Xi/xiproperty.c
configure.ac
dix/ptrveloc.c
hw/xfree86/common/xf86Config.c
mi/mipointer.h
test/input.c
xkb/xkb.c
2009-05-28 17:20:58 +10:00
..
2009-01-22 02:11:16 -05:00
2008-12-03 05:43:34 -02:00
2009-05-14 07:02:44 -04:00
2009-04-06 10:58:47 -04:00
2009-01-22 02:11:16 -05:00
2009-04-19 22:20:18 +10:00
2008-10-10 16:28:10 -04:00
2009-01-22 02:11:16 -05:00
2008-12-03 05:43:34 -02:00
2008-07-23 13:43:09 -04:00
2009-05-22 15:44:58 +10:00
2009-01-22 02:11:16 -05:00
2008-12-03 05:43:34 -02:00
2008-12-03 05:43:34 -02:00
2008-12-03 05:43:34 -02:00
2008-12-03 05:43:34 -02:00
2009-04-28 10:43:53 +10:00
2009-01-22 02:11:16 -05:00
2009-01-22 02:11:16 -05:00
2009-04-14 10:57:19 -04:00
2008-12-03 05:43:34 -02:00
2005-07-03 12:16:29 +00:00