diff options
| author | Akim Demaille <akim@lrde.epita.fr> | 2012-07-31 11:50:18 +0200 |
|---|---|---|
| committer | Akim Demaille <akim@lrde.epita.fr> | 2012-07-31 12:03:55 +0200 |
| commit | cb9ec4fada480554cf47810fee736997d64e7427 (patch) | |
| tree | 9f36a0c5ee15ad02df0bf70f1ef30d6471181341 /lib/.gitignore | |
| parent | 84271837f686cc9bdf2d7483d4493f26b52d133d (diff) | |
| parent | aaf63e45b65d35bb506e431ffa8360f259ee393c (diff) | |
| download | bison-cb9ec4fada480554cf47810fee736997d64e7427.tar.gz | |
Merge branch 'maint'
* maint:
use obstack_printf
scanner: restore a missing start condition
gnulib: update
maint: post-release administrivia
version 2.6.1
gnulib: update
maint: fix some syntax-check issues
tests: do not depend on __cplusplus to decide for C++ or C output
Conflicts:
NEWS
bootstrap.conf
cfg.mk
lib/.gitignore
Diffstat (limited to 'lib/.gitignore')
| -rw-r--r-- | lib/.gitignore | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/lib/.gitignore b/lib/.gitignore index 8e0e2096..a448e841 100644 --- a/lib/.gitignore +++ b/lib/.gitignore @@ -35,6 +35,8 @@ /close.c /closeout.c /closeout.h +/concat-filename.c +/concat-filename.h /config.charset /config.h /config.in.h @@ -62,6 +64,7 @@ /fd-hook.h /fd-safer-flag.c /fd-safer.c +/filename.h /float+.h /float.c /float.h @@ -123,6 +126,7 @@ /nonblocking.h /obstack.c /obstack.h +/obstack_printf.c /open.c /pathmax.h /perror.c @@ -223,6 +227,7 @@ /sys_socket.in.h /sys_stat.h /sys_stat.in.h +/sys_types.in.h /sys_wait.h /sys_wait.in.h /sysexits.in.h @@ -259,14 +264,10 @@ /xalloc-die.c /xalloc-oversized.h /xalloc.h +/xconcat-filename.c /xmalloc.c +/xmemdup0.c +/xmemdup0.h /xsize.h /xstrndup.c /xstrndup.h -/xmemdup0.c -/xmemdup0.h -/sys_types.in.h -/concat-filename.c -/concat-filename.h -/filename.h -/xconcat-filename.c |