]> git.sesse.net Git - casparcg/history - core/thumbnail_generator.cpp
manually merged 4a2171b from master
[casparcg] / core / thumbnail_generator.cpp
2013-08-29 niklaspanderssonMerge branch '2.1.0' of https://github.com/CasparCG...
2013-08-29 niklaspanderssonManually merged 0edf4e5 (excluding changes to ffmpeg...