diff options
author | Andy Wingo <wingo@pobox.com> | 2012-01-30 18:52:46 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2012-01-30 18:52:46 +0100 |
commit | 252acfe8e70ac4c7d325588ffea1905fcf6f86b2 (patch) | |
tree | e31cae9d145548b86cba6764d0943329a4ef64d1 /libguile/weak-vector.c | |
parent | 855db1905d56efcdf91ae51a9e80990f79030eae (diff) | |
parent | 3d51e57cfb0404db568a6adfde2a346d3fd9907e (diff) | |
download | guile-252acfe8e70ac4c7d325588ffea1905fcf6f86b2.tar.gz |
Merge commit '3d51e57cfb0404db568a6adfde2a346d3fd9907e'
Conflicts:
libguile/foreign.c
libguile/hashtab.c
module/ice-9/psyntax-pp.scm
module/language/tree-il/compile-glil.scm
Diffstat (limited to 'libguile/weak-vector.c')
0 files changed, 0 insertions, 0 deletions