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 /afb | |
| 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 'afb')
| -rw-r--r-- | afb/afbbres.c | 1 | ||||
| -rw-r--r-- | afb/afbbresd.c | 1 | ||||
| -rw-r--r-- | afb/afbbstore.c | 1 | ||||
| -rw-r--r-- | afb/afbfont.c | 1 | ||||
| -rw-r--r-- | afb/afbmisc.c | 1 | ||||
| -rw-r--r-- | afb/afbpntwin.c | 1 |
6 files changed, 0 insertions, 6 deletions
diff --git a/afb/afbbres.c b/afb/afbbres.c index e8f1b3b85..dae4746a0 100644 --- a/afb/afbbres.c +++ b/afb/afbbres.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/afb/afbbresd.c b/afb/afbbresd.c index 4495c8cf8..4f07ede6c 100644 --- a/afb/afbbresd.c +++ b/afb/afbbresd.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/afb/afbbstore.c b/afb/afbbstore.c index f7f1062e2..32d64ec47 100644 --- a/afb/afbbstore.c +++ b/afb/afbbstore.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /* diff --git a/afb/afbfont.c b/afb/afbfont.c index 940bdb09b..11a449423 100644 --- a/afb/afbfont.c +++ b/afb/afbfont.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* Copyright (c) 1987 X Consortium diff --git a/afb/afbmisc.c b/afb/afbmisc.c index 023c43f34..8e9c9e8e9 100644 --- a/afb/afbmisc.c +++ b/afb/afbmisc.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/afb/afbpntwin.c b/afb/afbpntwin.c index 94c96e4cf..6082f7caa 100644 --- a/afb/afbpntwin.c +++ b/afb/afbpntwin.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** |