From: Matthew Mondor <mmondor@pulsar-zone.net>
Date: Mon, 31 Aug 2015 05:14:19 +0000 (-0400)
Subject: Merge branch 'develop' of gitlab.com:embeddable-common-lisp/ecl into heap-size
X-Git-Url: http://git.pulsar-zone.net/?a=commitdiff_plain;h=eb5bb409b3c952e768cbe8ad0fc2e5d08fad2b77;p=ecl.git

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.
---

eb5bb409b3c952e768cbe8ad0fc2e5d08fad2b77