Merge remote-tracking branch 'origin/maint'

[bison.git] / m4 / .gitignore

diff --git a/m4/.gitignore b/m4/.gitignore
index e85072b329eb4cad53d94426f45ee97932d4c73b..3dfdf6adc8f4e963c4c89dd9b3207710f8f21cc5 100644 (file)
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -51,6 +51,7 @@
 /inline.m4
 /intdiv0.m4
 /intl.m4
 /inline.m4
 /intdiv0.m4
 /intl.m4

+/intl.m4~

 /intldir.m4
 /intlmacosx.m4
 /intmax.m4
 /intldir.m4
 /intlmacosx.m4
 /intmax.m4


@@ -102,6 +103,7 @@
 /perror.m4
 /pipe2.m4
 /po.m4
 /perror.m4
 /pipe2.m4
 /po.m4

+/po.m4~

 /posix_spawn.m4
 /printf-frexp.m4
 /printf-frexpl.m4
 /posix_spawn.m4
 /printf-frexp.m4
 /printf-frexpl.m4


@@ -181,3 +183,4 @@
 /xstrndup.m4
 /obstack-printf.m4
 /extern-inline.m4
 /xstrndup.m4
 /obstack-printf.m4
 /extern-inline.m4

+/non-recursive-gnulib-prefix-hack.m4