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)
1  2 
python/lib/moresetuptools.py
src/wscript_build
wscript

Simple merge
Simple merge
diff --cc wscript
Simple merge