diff options
author | Andy Wingo <wingo@pobox.com> | 2013-01-31 11:52:42 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2013-01-31 11:52:42 +0100 |
commit | 180ac9d7b0bac97bdead2813a1b0b23d19002c3e (patch) | |
tree | 03eaf96f917af90c523dadbee1609697844ece0d /.gitignore | |
parent | 5da51ad78d08c71083b70e6a9205ce937f5438ba (diff) | |
parent | ceb7f9cc126f50e0cc8956b80ac5d111580b23c8 (diff) | |
download | guile-180ac9d7b0bac97bdead2813a1b0b23d19002c3e.tar.gz |
Merge remote-tracking branch 'origin/stable-2.0'
Conflicts:
module/ice-9/psyntax-pp.scm
module/ice-9/psyntax.scm
module/language/bytecode/spec.scm
module/language/tree-il/spec.scm
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index d67839a02..07601b9ec 100644 --- a/.gitignore +++ b/.gitignore @@ -150,3 +150,5 @@ INSTALL /lib/dirent.h /lib/langinfo.h /lib/wctype.h +/build-aux/ar-lib +/build-aux/test-driver |