Eric Anholt b4b0d901d9 Merge branch 'randr-1.2' ...

Conflicts:

	dix/events.c
	dix/getevents.c
	hw/xfree86/common/xf86Mode.c
	hw/xfree86/dri/Makefile.am
	hw/xfree86/os-support/drm/xf86drm.c
	hw/xfree86/os-support/xf86drm.h

2006-11-27 15:43:15 -08:00

..

bstore.h

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

bstorestr.h

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

closestr.h

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

closure.h

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

colormap.h

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

colormapst.h

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

config.h

add basic D-BUS configuration mechanism

2006-07-21 15:19:49 -04:00

cursor.h

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

cursorstr.h

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

dix-config.h.in

Merge master back to randr-1.2

2006-11-04 17:46:26 -08:00

dix.h

ffs: handle 0 argument (bug #8968)

2006-11-11 14:13:56 +02:00

dixevents.h

Avoid dereferencing sprite.screen when Xinerama is not running. (#8925)

2006-11-07 01:29:51 -08:00

dixfont.h

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

dixfontstr.h

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

dixgrabs.h

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

dixstruct.h

Merge branch 'XACE-modular' into my-XACE-modular

2006-08-21 18:49:31 -04:00

exevents.h

Xi: move SendEventToAllWindows and FindInterestedChildren to exevents

2006-10-08 20:30:49 +03:00

extension.h

Merge branch 'XACE-modular' into my-XACE-modular

2006-08-21 18:49:31 -04:00

extinit.h

Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug

2006-07-21 19:05:41 -04:00

extnsionst.h

Merge branch 'XACE-modular' into my-XACE-modular

2006-08-21 18:49:31 -04:00

gc.h

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

gcstruct.h

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

globals.h

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

input.h

Merge branch 'randr-1.2'

2006-11-27 15:43:15 -08:00

inputstr.h

dix: add motion history support

2006-10-25 01:08:29 +03:00

kdrive-config.h.in

kdrive: numerous warning fixes

2006-10-23 06:08:27 +03:00

Makefile.am

distribute config.h

2006-07-21 15:19:53 -04:00

misc.h

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

miscstruct.h

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

opaque.h

dix: add whiteroot flag

2006-08-18 17:04:48 +03:00

os.h

include: actually declare DebugF

2006-10-08 17:04:12 +03:00

pixmap.h

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

pixmapstr.h

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

property.h

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

propertyst.h

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

region.h

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

regionstr.h

dix/mi: still more warning fixes

2006-11-08 15:29:16 +02:00

resource.h

Merge branch 'XACE-modular' into my-XACE-modular

2006-08-21 18:49:31 -04:00

rgb.h

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

screenint.h

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

scrnintstr.h

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

selection.h

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

servermd.h

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

site.h

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

swaprep.h

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

swapreq.h

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

validate.h

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

window.h

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

windowstr.h

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

xgl-config.h.in

Initial commit of XGL build infrastructure and XGL code changes for

2005-12-28 10:31:46 +00:00

XIstubs.h

Xi: disallow changing core keyboard and pointer

2006-10-29 03:43:34 +03:00

xkb-config.h.in

Fix remnants of previous busted _XkbStrCaseCmp commit.

2006-03-27 22:28:32 +00:00

xorg-config.h.in

Add a -showDefaultLibPath option.

2006-11-22 14:46:51 -08:00

xorg-server.h.in

get rid of XFree86LOADER, XFree86Server, XFree86Module, and IN_MODULE

2006-07-18 18:17:38 -04:00

xwin-config.h.in

Define XFree86Server only where it is required.

2005-12-02 06:02:45 +00:00