Merge branch 'master' into yinfast
authorPaul Brossier <piem@piem.org>
Mon, 24 Jul 2017 12:12:55 +0000 (14:12 +0200)
committerPaul Brossier <piem@piem.org>
Mon, 24 Jul 2017 12:12:55 +0000 (14:12 +0200)
commit9fa0ed1c5637f2225d54d517df5bacd18f7b9564
tree8ce61f10edd71d464fce4e8dda2dd5ab140c9ee2
parent482641dfc6c50215aba77293bf5de6143e24e983
parentddea34baa30138933e6bc2dd5333718666aaccb7
Merge branch 'master' into yinfast
doc/web.cfg
python/lib/gen_external.py