diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-05-28 17:20:58 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-05-28 17:20:58 +1000 |
| commit | d7aef3f663f4b5d861799f8615dcd301d5ce2906 (patch) | |
| tree | 3a5ed1b3dc7e83536979578e3da99f2860f44b11 /mi/mifpoly.h | |
| parent | a25f248fc3bd0375d91ca8a44320200d445ecfbb (diff) | |
| parent | e08c6a0752772745f35f7afcf6c2b1c927b91cc0 (diff) | |
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
Diffstat (limited to 'mi/mifpoly.h')
0 files changed, 0 insertions, 0 deletions