diff options
| author | Andy Wingo <wingo@pobox.com> | 2012-01-10 00:41:42 +0100 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2012-01-10 00:41:42 +0100 |
| commit | 91ee7515da0bad91330ce5c87b250d6cf12a2789 (patch) | |
| tree | ce023c92c0d9bf895c1265b107b270c35ba59b94 /m4 | |
| parent | 0bdd43515eb3c62839512181cf33e5aea383e661 (diff) | |
| parent | 0e947e1d14597651c5762a4209225c472bdaef45 (diff) | |
Merge remote-tracking branch 'origin/stable-2.0'
Conflicts:
libguile/__scm.h
libguile/array-map.c
libguile/procprop.c
libguile/tags.h
module/ice-9/deprecated.scm
module/ice-9/psyntax-pp.scm
module/ice-9/psyntax.scm
test-suite/standalone/test-num2integral.c
test-suite/tests/regexp.test
Diffstat (limited to 'm4')
0 files changed, 0 insertions, 0 deletions