diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-12-14 00:32:24 -0500 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil> | 2007-12-14 00:32:24 -0500 |
| commit | 86b2e59bfb79bd042a13c35fbb4ccecec576f629 (patch) | |
| tree | 1db045b8f90902bf1e7314e440341db888b351b6 /.gitignore | |
| parent | 1c1a4bc970be061484bb8dcccf945eb08144c656 (diff) | |
| parent | cb0d7e2c2692a332e2bd5495478ebf9a6cd601d0 (diff) | |
Merge branch 'master' into XACE-SELINUX
Conflicts:
configure.ac
This is the last pull before merging to master.
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 3e5001a7e..b52664bda 100644 --- a/.gitignore +++ b/.gitignore @@ -273,7 +273,6 @@ hw/xprint/doc/Xprt.1x hw/xprint/doc/Xprt.man hw/xprint/dpmsstubs-wrapper.c hw/xprint/miinitext-wrapper.c -hw/xquartz/bundle/org.x.X11.plist include/dix-config.h include/kdrive-config.h include/xgl-config.h |