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 /dix/resource.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 'dix/resource.c')
| -rw-r--r-- | dix/resource.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/dix/resource.c b/dix/resource.c index e89ad1fdd..ea0a3105c 100644 --- a/dix/resource.c +++ b/dix/resource.c @@ -101,8 +101,6 @@ Equipment Corporation. * of the copyright holder. */ -/* $TOG: resource.c /main/41 1998/02/09 14:20:31 kaleb $ */ - /* Routines to manage various kinds of resources: * * CreateNewResourceType, CreateNewResourceClass, InitClientResources, |