diff options
author | Andy Wingo <wingo@pobox.com> | 2012-03-26 00:56:29 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2012-03-26 00:56:29 +0200 |
commit | c8ab29ac8e32f3f68efe1652e27d4a4cb2d90f4e (patch) | |
tree | f40e9c3c0ffaa34c35dd80f29c46bda1f920c1d6 /libguile/strings.c | |
parent | 01e909d90a130f4987b70edae2dbd5a2b33edae7 (diff) | |
parent | a8004dcb4d7148ec66cbaa109a18715d757700eb (diff) | |
download | guile-c8ab29ac8e32f3f68efe1652e27d4a4cb2d90f4e.tar.gz |
Merge remote-tracking branch 'origin/stable-2.0'
Conflicts:
libguile/procprop.c
libguile/smob.c
libguile/smob.h
libguile/vm.c
module/language/tree-il/primitives.scm
Diffstat (limited to 'libguile/strings.c')
0 files changed, 0 insertions, 0 deletions