Repositories / ecl.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d21d806 43d8548)
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)
Conflicts:
msvc/ecl/config.h.msvc6
src/c/big.d
src/c/main.d

Conflicts fixed.


Trivial merge
Embeddable Common Lisp (Official: https://gitlab.com/embeddable-common-lisp/ecl)