Merge branch 'master' into sampler
authorPaul Brossier <piem@piem.org>
Sat, 25 Mar 2017 11:12:38 +0000 (12:12 +0100)
committerPaul Brossier <piem@piem.org>
Sat, 25 Mar 2017 11:12:38 +0000 (12:12 +0100)
commitfbafd2c5488cc94158879f02afa3b310cdb72c08
tree734df4f0d8939f72a4bec80994e49f136523caec
parentf8d96f1b233876843d1f647d771cd0e4a6d23bc2
parent2a7bcaacd74b38b47b91e6951d1c1481a515f064
Merge branch 'master' into sampler
python/lib/moresetuptools.py
src/io/source_avcodec.c
wscript