summaryrefslogtreecommitdiff
path: root/libguile/vm-engine.c
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2013-11-28 16:03:58 +0100
committerAndy Wingo <wingo@pobox.com>2013-11-28 16:03:58 +0100
commit6683f204ba95321f2cf904d0508117b027f2f2fc (patch)
treebf79cb1a9d3f3a4f8a787b39cb21165f832c89dd /libguile/vm-engine.c
parentf76cf73a49e0219f81a2fa0fc8431a0b83280822 (diff)
parent2437c7b2e8b4ab7786847ee1ce0b59e446a70fe2 (diff)
downloadguile-6683f204ba95321f2cf904d0508117b027f2f2fc.tar.gz
Merge commit '2437c7b2e8b4ab7786847ee1ce0b59e446a70fe2'
Conflicts: libguile/guardians.c
Diffstat (limited to 'libguile/vm-engine.c')
0 files changed, 0 insertions, 0 deletions