Merge branch 'master' into pretty-print
authorKim Nguyễn <kn@lri.fr>
Sun, 21 Oct 2012 07:51:19 +0000 (09:51 +0200)
committerKim Nguyễn <kn@lri.fr>
Sun, 21 Oct 2012 07:52:09 +0000 (09:52 +0200)
commit13a15353a161600575ff4b70eda2c7a0f024d969
tree292e8052919611af00468af698e012d47cb245d1
parent38a3c71734760b87bd2ee9a5f80c8aaeadc9ee54
parent107df590ff69de765445e22caffd416ef13288d3
Merge branch 'master' into pretty-print
include/utils.ml
src/options.ml