summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2014-11-16 00:22:20 -0500
committerStefan Monnier <monnier@iro.umontreal.ca>2014-11-16 00:22:20 -0500
commit9075fcc1937a211bc91e8bc49c332bc55ac99e24 (patch)
tree1cff4991107011e0b5d13fac46b0881c30d31a63 /.gitignore
parent86009dd5d886f1101358990e4f8f69a5d1467eb8 (diff)
parent4f4cf9c855f5818d4c3c0fb772db8bbcf4f33780 (diff)
downloademacs-9075fcc1937a211bc91e8bc49c332bc55ac99e24.tar.gz
Merge from emacs-24
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore18
1 files changed, 15 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index b5483840f3a..1fb7d493177 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@ autom4te.cache
makefile
TAGS
*~
+.#*
/README.W32
/bin/
@@ -26,6 +27,8 @@ test/biditest.txt
Makefile
config.log
config.status
+config.cache
+lib-src/blessmail
lib-src/ctags
lib-src/ebrowse
lib-src/emacsclient
@@ -34,12 +37,18 @@ lib-src/hexl
lib-src/make-docfile
lib-src/movemail
lib-src/profile
+lib-src/test-distrib
lib-src/update-game-score
*.o
+*.exe
+*.res
lib/alloca.h
lib/arg-nonnull.h
+lib/byteswap.h
lib/c++defs.h
lib/dirent.h
+lib/errno.h
+lib/execinfo.h
lib/fcntl.h
lib/getopt.h
lib/inttypes.h
@@ -47,6 +56,7 @@ lib/libgnu.a
lib/signal.h
lib/stdio.h
lib/stdlib.h
+lib/stdalign.h
lib/string.h
lib/sys/
lib/time.h
@@ -55,12 +65,13 @@ lib/warn-on-use.h
src/bootstrap-emacs
src/deps/
src/emacs
-src/emacs-25.0.50.1
-src/emacs-25.0.50.2
+src/emacs-[0-9]*
src/gl-stamp
src/globals.h
src/stamp-h1
src/temacs
+src/temacs.map
+src/temacs.tmp
doc/emacs/emacsver.texi
doc/man/emacs.1
etc/refcards/emacsver.tex
@@ -68,4 +79,5 @@ lib/.deps/
lisp/international/uni-brackets.el
lwlib/deps/
lwlib/liblw.a
-
+leim/changed.misc
+leim/changed.tit