diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2007-04-02 15:36:26 +0930 |
|---|---|---|
| committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2007-04-02 15:36:26 +0930 |
| commit | e8777a91f37d828b9df839bf3d9cf2f954bdddb0 (patch) | |
| tree | 07dbc5bb75954b39eb84809907f58025b3419773 /hw/xfree86/common/xf86.h | |
| parent | a12054757d21edacc1c24c3077b9214726652829 (diff) | |
| parent | 96ce17aa94413c4b8bcb61cae71167050130a307 (diff) | |
Merge branch 'master' into mpx
Conflicts:
Xi/closedev.c
Xi/exevents.c
Xi/extinit.c
Xi/listdev.c
dix/window.c
hw/xfree86/common/xf86Xinput.c
include/extinit.h
mi/mipointer.c
Diffstat (limited to 'hw/xfree86/common/xf86.h')
0 files changed, 0 insertions, 0 deletions