Merge branch 'develop' of gitlab.com:embeddable-common-lisp/ecl into heap-size
authorMatthew Mondor <mmondor@pulsar-zone.net>
Mon, 31 Aug 2015 05:14:19 +0000 (01:14 -0400)
committerMatthew Mondor <mmondor@pulsar-zone.net>
Mon, 31 Aug 2015 05:14:19 +0000 (01:14 -0400)
commiteb5bb409b3c952e768cbe8ad0fc2e5d08fad2b77
tree4ba24dfdbde37b599525716d301afaa68e8af250
parentd21d80678893fb2bd04a45673f74cd951cff5f10
parent43d854834c2dd446cf763b2a17907653280b0efe
Merge branch 'develop' of gitlab.com:embeddable-common-lisp/ecl into heap-size

Conflicts:
msvc/ecl/config.h.msvc6
src/c/big.d
src/c/main.d

Conflicts fixed.