XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-04-14 17:18:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into XACE-SELINUX

Browse Source 
Conflicts:

	dix/devices.c
	dix/property.c
	include/dix.h
This commit is contained in:
Eamon Walsh
2007-08-02 14:27:03 -04:00
committed by Eamon Walsh
parent 32c0dcc8c0 f3955c0a02
commit e34fcd2bf4
755 changed files with 15815 additions and 5800 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cfb/cfbcppl.c
View File

@@ -1,6 +1,4 @@
/*
* $TOG: cfb8cppl.c /main/16 1998/02/09 14:04:13 kaleb $
*
Copyright 1990, 1998 The Open Group
Permission to use, copy, modify, distribute, and sell this software and its

2
cfb/cfbtab.h
View File

@@ -1,5 +1,3 @@
/* $XFree86$ */
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif