diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-11-14 13:35:50 -0500 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil> | 2007-11-14 13:35:50 -0500 |
| commit | 1603130236c55ddabc3854d4ba62d544debcf1f5 (patch) | |
| tree | 02b1cffad943cb69c2b79118b0ab9a758b9e0f1a /.gitignore | |
| parent | f207e69d62bc04c7f254347b03e6d8fa8b569d66 (diff) | |
| parent | f7dd0c72b8f861f4d5443a43d1013e3fe3db43ca (diff) | |
Merge branch 'master' into XACE-SELINUX
Conflicts:
Xext/xace.c
Xext/xace.h
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 1213d9993..deca0e20b 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,9 @@ Makefile.in *.a *.o *~ +.*.swp +obj* +build* aclocal.m4 autom4te.cache compile @@ -296,4 +299,3 @@ mfb/mfbteblack.c mfb/mfbtewhite.c mfb/mfbtileC.c mfb/mfbtileG.c -.*.swp |