diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-09-28 10:30:03 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-09-28 10:32:18 +0000 |
| commit | c037c23ef09fbe981d8663a6e9644ae1717e1649 (patch) | |
| tree | d614ccb3a56cb15b0febb0e04e9c8f37614fee36 /.gitignore | |
| parent | 6636367748db8d68bf9d699e70c44d641f235d0f (diff) | |
| parent | 80cddc9ba64d1f4a82449680e4adc52918177d1f (diff) | |
Merge branch 'upstream'
Conflicts:
doc/gpl.texi
doc/mach.texi
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 4488bc2..0000000 --- a/.gitignore +++ /dev/null @@ -1,39 +0,0 @@ -*~ - -.deps/ -.dirstamp -*.o -*.a -/gnumach -/gnumach-undef -/gnumach-undef-bad -/gnumach.msgids - -# Makerules.am -*.gz -*.stripped - -# Makerules.mig.am -*.user.* -*.server.* - -autom4te.cache/ -build-aux/ -/INSTALL -/Makefile -/Makefile.in -/aclocal.m4 -/config.h -/config.h.in -/config.log -/config.status -/config.status.orig -/configure -/stamp-h1 -/version.c - -# Ignore arch symlinks -/machine -/mach/machine -/linux/src/include/asm -/linux/dev/include/asm |