Merge branch 'emacs-24'.

[gnu-emacs] / .gitignore

diff --git a/.gitignore b/.gitignore
index 989bbb021228bd51395d12ad6679fe3f14637b00..8e8a032ef5fc917a59b62189a83a6c2374b9dd9a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -117,8 +117,6 @@ deps/
 # Logs and temporaries.
 *.log
 *.tmp
-# Created by MS-DOS builds
-src/_gdbinit
 
 # Time stamps.
 stamp_BLD
@@ -221,8 +219,11 @@ lisp/international/uni-*.el
 *.tps
 *.vr
 *.vrs
+doc/emacs/emacsver.texi
+doc/man/emacs.1
 doc/misc/cc-mode.ss
 etc/DOC
+etc/refcards/emacsver.tex
 info/dir
 
 # Version control and locks.
@@ -253,5 +254,7 @@ lib/SYS/
 /README.W32
 /share/
 /site-lisp/
+nt/emacs.rc
+nt/emacsclient.rc
 src/gdb.ini
 /var/