diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-08-02 14:27:03 -0400 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil> | 2007-08-02 14:27:03 -0400 |
| commit | e34fcd2bf42dbd72ab6ce2df80f2dcaa13416e74 (patch) | |
| tree | c9639b11acb0ff6c90d774574b0392d81320e84e /cfb | |
| parent | 32c0dcc8c0d1edba5d7e418fd2dc916847a4f069 (diff) | |
| parent | f3955c0a020b39021050cd33c20a17f14fc4b579 (diff) | |
Merge branch 'master' into XACE-SELINUX
Conflicts:
dix/devices.c
dix/property.c
include/dix.h
Diffstat (limited to 'cfb')
| -rw-r--r-- | cfb/cfbcppl.c | 2 | ||||
| -rw-r--r-- | cfb/cfbtab.h | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/cfb/cfbcppl.c b/cfb/cfbcppl.c index 91b61a711..c13baf143 100644 --- a/cfb/cfbcppl.c +++ b/cfb/cfbcppl.c @@ -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 diff --git a/cfb/cfbtab.h b/cfb/cfbtab.h index d95efd66d..60d203f90 100644 --- a/cfb/cfbtab.h +++ b/cfb/cfbtab.h @@ -1,5 +1,3 @@ -/* $XFree86$ */ - #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> #endif |