diff options
author | Andy Wingo <wingo@pobox.com> | 2011-05-25 10:32:19 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2011-05-25 10:32:19 +0200 |
commit | a099c8d971c1d5b32e00f25469b36ce45fd4d8c7 (patch) | |
tree | 350e16d9e9e01c95c366aa44ba31d03bf57ac83c /libguile/inline.c | |
parent | 9ec1573d2b9463043df79b9a2cb30acc6afaeaaa (diff) | |
parent | 7ad0737de9b7bbb5f4f938518b4905b526d13ca6 (diff) | |
download | guile-a099c8d971c1d5b32e00f25469b36ce45fd4d8c7.tar.gz |
Merge remote-tracking branch 'origin/stable-2.0'
Conflicts:
libguile/procprop.c
Diffstat (limited to 'libguile/inline.c')
0 files changed, 0 insertions, 0 deletions