conflicts: refactor the counting routines

[bison.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 440a9300628b78afef8483f36da3c0ccf84641c5..bfb7caf41626345c518b018600adaa11c91952c0 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,17 @@
 /*.cache
 /*.flc
 /*.prj
+/*~
+/.tarball-version
 /.version
 /ABOUT-NLS
 /COPYING
+/ChangeLog
+/GNUmakefile
 /INSTALL
 /Makefile
 /Makefile.in
+/README-release
 /_*
 /a.exe
 /a.out
@@ -23,6 +28,7 @@
 /gnulib
 /javacomp.sh
 /javaexec.sh
+/maint.mk
 /patches
 /releases
 /stamp-h*