diff options
author | Andy Wingo <wingo@pobox.com> | 2012-05-08 22:43:04 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2012-05-08 22:43:04 +0200 |
commit | a3ded46520b35a8dbda22097b74792b8282d12ce (patch) | |
tree | 9af4c888be060263851d602031dc162023e1d55e /libguile/vm-engine.c | |
parent | 4d497b629b73afda35ba409c3dcbfb665fe41dde (diff) | |
parent | 33672b071118f54ee637afa00349f2a4404a84da (diff) | |
download | guile-a3ded46520b35a8dbda22097b74792b8282d12ce.tar.gz |
Merge remote-tracking branch 'origin/stable-2.0'
Conflicts:
libguile/ports.c
libguile/ports.h
libguile/read.c
libguile/vm-i-system.c
Diffstat (limited to 'libguile/vm-engine.c')
0 files changed, 0 insertions, 0 deletions