diff options
| author | Andy Wingo <wingo@pobox.com> | 2011-10-27 13:45:04 +0200 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2011-10-27 13:45:04 +0200 |
| commit | 4938d3cb742de2a356586c55e5af32e193c5990b (patch) | |
| tree | b4bfe0fd26e102c5fa38ca9965bc4ebdbae8e3b4 /.gitignore | |
| parent | 9d013330154852bc2309947adaa30b32418642c0 (diff) | |
| parent | 2be3feb17e5456bba71749e0e97adf45c32c4e0e (diff) | |
| download | guile-4938d3cb742de2a356586c55e5af32e193c5990b.tar.gz | |
Merge remote-tracking branch 'origin/stable-2.0'
Conflicts:
GUILE-VERSION
libguile/deprecated.c
libguile/gc-malloc.c
module/language/tree-il/peval.scm
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 229acc2e3..aa3f94cac 100644 --- a/.gitignore +++ b/.gitignore @@ -143,3 +143,4 @@ INSTALL /test-suite/standalone/test-pthread-create /test-suite/standalone/test-pthread-create-secondary /lib/fcntl.h +/lib/sys/uio.h |