Merge remote-tracking branch 'origin/stable-2.0'
authorAndy Wingo <wingo@pobox.com>
Mon, 28 Apr 2014 16:51:21 +0000 (18:51 +0200)
committerAndy Wingo <wingo@pobox.com>
Mon, 28 Apr 2014 16:51:21 +0000 (18:51 +0200)
commitd7a67c3e918acd8ca46dc7792a8ca98b33cb94e8
tree7ccf125978778d1ac6bb656245305c76db8e02d0
parent475772ea57c97d0fa0f9ed9303db137d9798ddd3
parent4338f2f91e1dd63a40384077d091295d90047926
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
12 files changed:
.gitignore
doc/ref/Makefile.am
doc/ref/api-control.texi
doc/ref/api-memory.texi
doc/ref/guile.texi
doc/ref/libguile-concepts.texi
libguile.h
libguile/Makefile.am
libguile/goops.c
libguile/init.c
module/Makefile.am
test-suite/standalone/Makefile.am