Merge branch 'master' into gitshaversion
authorPaul Brossier <piem@piem.org>
Thu, 23 Mar 2017 14:46:07 +0000 (15:46 +0100)
committerPaul Brossier <piem@piem.org>
Thu, 23 Mar 2017 14:46:07 +0000 (15:46 +0100)
commit24c207f23ec4eb69f5f92af98896e56def59af19
tree7b362075de953da6596491755e0ecf61da6c7cbb
parent59be50dfa19e13f55ac5be918b9b6505cf679c14
parent91fa88d3c702a0a38a3a75d842f3cecf823b25e1
Merge branch 'master' into gitshaversion
python/lib/moresetuptools.py
src/wscript_build
wscript