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 /hw/dmx/config/dmxparse.c | |
| 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 'hw/dmx/config/dmxparse.c')
| -rw-r--r-- | hw/dmx/config/dmxparse.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/hw/dmx/config/dmxparse.c b/hw/dmx/config/dmxparse.c index 1acb6d13e..0bf947051 100644 --- a/hw/dmx/config/dmxparse.c +++ b/hw/dmx/config/dmxparse.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * |