diff options
author | Andy Wingo <wingo@pobox.com> | 2012-05-10 13:02:11 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2012-05-10 13:02:11 +0200 |
commit | 968a9add65c5e3a33ab9f5b7697051c5b9282060 (patch) | |
tree | f793baeb1f36037956c161c0ddc168fdbe5ec387 /libguile/init.c | |
parent | a3ded46520b35a8dbda22097b74792b8282d12ce (diff) | |
parent | 67b699cc77d5e2f74daca77aa26b1ba8af0d0808 (diff) | |
download | guile-968a9add65c5e3a33ab9f5b7697051c5b9282060.tar.gz |
Merge remote-tracking branch 'local-2.0/stable-2.0'
Conflicts:
libguile/vm-engine.c
libguile/vm-i-system.c
libguile/vm.c
Diffstat (limited to 'libguile/init.c')
0 files changed, 0 insertions, 0 deletions