Merge branch 'stable-2.0'
authorMark H Weaver <mhw@netris.org>
Tue, 30 Sep 2014 07:50:47 +0000 (03:50 -0400)
committerMark H Weaver <mhw@netris.org>
Tue, 30 Sep 2014 07:50:47 +0000 (03:50 -0400)
commit856d318a9f543d8a61fcf61caae7d07102586802
tree10bd99500c027bbd472253f6cc34f8b1b516d4a1
parentf7582f9807d9a10fba86f54c4aeaa7444c51a315
parent3157d455039f137ca5dfa8b9fbc4a3404ce00606
Merge branch 'stable-2.0'

Conflicts:
benchmark-suite/benchmarks/ports.bm
libguile/async.h
libguile/bytevectors.c
libguile/foreign.c
libguile/gsubr.c
libguile/srfi-1.c
libguile/vm-engine.h
libguile/vm-i-scheme.c
module/Makefile.am
module/language/tree-il/analyze.scm
module/language/tree-il/peval.scm
module/scripts/compile.scm
module/scripts/disassemble.scm
test-suite/tests/asm-to-bytecode.test
test-suite/tests/peval.test
test-suite/tests/rdelim.test
36 files changed:
benchmark-suite/benchmarks/ports.bm
configure.ac
doc/ref/api-evaluation.texi
doc/ref/posix.texi
doc/ref/srfi-modules.texi
guile-readline/ice-9/readline.scm
libguile/async.h
libguile/bytevectors.c
libguile/debug.c
libguile/filesys.c
libguile/foreign.c
libguile/fports.c
libguile/gsubr.c
libguile/init.c
libguile/list.c
libguile/load.c
libguile/posix.c
libguile/simpos.c
libguile/smob.h
libguile/srfi-1.c
libguile/threads.c
module/Makefile.am
module/ice-9/boot-9.scm
module/language/tree-il/analyze.scm
module/language/tree-il/peval.scm
module/scripts/compile.scm
module/system/base/target.scm
test-suite/standalone/Makefile.am
test-suite/test-suite/lib.scm
test-suite/tests/cross-compilation.test
test-suite/tests/modules.test
test-suite/tests/peval.test
test-suite/tests/ports.test
test-suite/tests/r6rs-ports.test
test-suite/tests/rdelim.test
test-suite/tests/tree-il.test