Peter Hutterer
4f2cd0ed96
Merge branch 'master' into mpx
This merge reverts Magnus' device coorindate scaling changes. MPX core event
generation is very different, so we can't scale in GetPointerEvents.
Conflicts:
Xi/opendev.c
dix/devices.c
dix/dixfonts.c
dix/getevents.c
dix/resource.c
dix/window.c
hw/xfree86/common/xf86Xinput.c
mi/mipointer.c
xkb/ddxBeep.c
xkb/ddxCtrls.c
xkb/ddxKeyClick.c
xkb/ddxList.c
xkb/ddxLoad.c
xkb/xkb.c
xkb/xkbAccessX.c
xkb/xkbEvents.c
xkb/xkbInit.c
xkb/xkbPrKeyEv.c
xkb/xkbUtils.c
|
2008-03-04 18:11:10 +10:30 |
| .. |
|
extmod
|
Merge branch 'master' into mpx
|
2008-03-04 18:11:10 +10:30 |
|
afbmodule.c
|
Remove mfb and cfb from include paths where they're not needed.
|
2007-05-11 11:43:19 -04:00 |
|
cfb32module.c
|
Remove mfb and cfb from include paths where they're not needed.
|
2007-05-11 11:43:19 -04:00 |
|
cfbmodule.c
|
Remove mfb and cfb from include paths where they're not needed.
|
2007-05-11 11:43:19 -04:00 |
|
dbemodule.c
|
Ensure all *ModuleData symbols are marked _X_EXPORT. Start removing
|
2006-06-05 03:00:24 +00:00 |
|
fbmodule.c
|
Build infrastructure for libwfb.so.
|
2006-07-26 15:48:50 -07:00 |
|
ftmodule.c
|
Ensure all *ModuleData symbols are marked _X_EXPORT. Start removing
|
2006-06-05 03:00:24 +00:00 |
|
GLcoremodule.c
|
Ensure all *ModuleData symbols are marked _X_EXPORT. Start removing
|
2006-06-05 03:00:24 +00:00 |
|
glxmodule.c
|
Add GLX provider for DRI2.
|
2008-02-14 19:53:49 -05:00 |
|
Makefile.am
|
Get rid of the type1 font module.
|
2007-08-23 11:27:33 +02:00 |
|
mfbmodule.c
|
Ensure all *ModuleData symbols are marked _X_EXPORT. Start removing
|
2006-06-05 03:00:24 +00:00 |
|
recordmod.c
|
Ensure all *ModuleData symbols are marked _X_EXPORT. Start removing
|
2006-06-05 03:00:24 +00:00 |
|
shmodule.c
|
Ensure all *ModuleData symbols are marked _X_EXPORT. Start removing
|
2006-06-05 03:00:24 +00:00 |
|
xf86XTrapModule.c
|
Ensure all *ModuleData symbols are marked _X_EXPORT. Start removing
|
2006-06-05 03:00:24 +00:00 |
|
xkbKillSrv.c
|
XKB: Actions: Don't run certain actions on the core keyboard
|
2007-12-05 19:37:48 +00:00 |
|
xkbPrivate.c
|
Static markup and dead code cull over xkb/.
|
2007-03-20 18:37:02 -04:00 |
|
xkbVT.c
|
Static markup and dead code cull over xkb/.
|
2007-03-20 18:37:02 -04:00 |