Merge branch 'master' into sampler
authorPaul Brossier <piem@piem.org>
Fri, 17 Mar 2017 09:59:51 +0000 (10:59 +0100)
committerPaul Brossier <piem@piem.org>
Fri, 17 Mar 2017 09:59:51 +0000 (10:59 +0100)
commitbad88364f0b29bd0a3232be856a2c6df88ed830b
tree66990ff7c2fe49ff83fcfc8d91d46f6b6543cb77
parentbff692e7bf9dc25d5a3fdd14d6c4530a802236db
parentc7d444a96b456843e2774610a06879218faf6e4b
Merge branch 'master' into sampler
python/lib/moresetuptools.py
src/io/source_avcodec.c
src/wscript_build
wscript