diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-05-22 14:50:26 -0400 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-uranus.epoch.ncsc.mil> | 2007-05-22 14:50:26 -0400 |
| commit | 2a4aa63a23ddd816b647b851a01865861827a7eb (patch) | |
| tree | a957a7979bda27a4a2c103835cfd6e3a7ddc79e5 /dix/resource.c | |
| parent | 9cee4ec5e6e06d23aafb302494b082c77ade4623 (diff) | |
| parent | cc648e609d472472bac4a2e568eb3598b3690ba3 (diff) | |
Merge branch 'master' into XACE-SELINUX
Conflicts:
include/miscstruct.h
Diffstat (limited to 'dix/resource.c')
0 files changed, 0 insertions, 0 deletions