diff options
| author | Andy Wingo <wingo@pobox.com> | 2014-04-28 18:51:21 +0200 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2014-04-28 18:51:21 +0200 |
| commit | d7a67c3e918acd8ca46dc7792a8ca98b33cb94e8 (patch) | |
| tree | 7ccf125978778d1ac6bb656245305c76db8e02d0 /.gitignore | |
| parent | 475772ea57c97d0fa0f9ed9303db137d9798ddd3 (diff) | |
| parent | 4338f2f91e1dd63a40384077d091295d90047926 (diff) | |
| download | guile-d7a67c3e918acd8ca46dc7792a8ca98b33cb94e8.tar.gz | |
Merge remote-tracking branch 'origin/stable-2.0'
Conflicts:
.gitignore
doc/example-smob/Makefile
doc/ref/api-smobs.texi
doc/ref/libguile-concepts.texi
doc/ref/libguile-smobs.texi
libguile.h
libguile/finalizers.c
libguile/finalizers.h
libguile/goops.c
module/language/tree-il/compile-glil.scm
module/oop/goops.scm
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 12cbc32f5..6375f2bc5 100644 --- a/.gitignore +++ b/.gitignore @@ -161,3 +161,5 @@ INSTALL /test-suite/standalone/test-scm-to-latin1-string /test-suite/standalone/test-scm-c-bind-keyword-arguments /libguile/vm-operations.h +/test-suite/standalone/test-foreign-object-c +/test-suite/standalone/test-srfi-4 |