diff options
author | Andy Wingo <wingo@pobox.com> | 2013-11-28 14:53:03 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2013-11-28 14:53:03 +0100 |
commit | 6dd98109020997d22f78d9cd516d7809c4fcc493 (patch) | |
tree | 0249ff205110f8e5a957abed5f14f2e37c32b713 /.gitignore | |
parent | acf7530a3ed55f15f6275f0419ef4347f8eb6f6c (diff) | |
parent | 750ac8c592e792e627444f476877f282525b132e (diff) | |
download | guile-6dd98109020997d22f78d9cd516d7809c4fcc493.tar.gz |
Merge commit '750ac8c592e792e627444f476877f282525b132e'
Conflicts:
.gitignore
libguile/deprecated.c
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index b136c7ae2..12cbc32f5 100644 --- a/.gitignore +++ b/.gitignore @@ -150,10 +150,14 @@ INSTALL /lib/dirent.h /lib/langinfo.h /lib/wctype.h +/lib/poll.h +/lib/sys/select.h +/lib/sys/times.h /build-aux/ar-lib /build-aux/test-driver *.trs /test-suite/standalone/test-smob-mark /test-suite/standalone/test-scm-values /test-suite/standalone/test-scm-to-latin1-string +/test-suite/standalone/test-scm-c-bind-keyword-arguments /libguile/vm-operations.h |