[FFmpeg-cvslog] Merge commit '42eb9154a83e9a7aedb1168b2f1112af765cf2b5'
Michael Niedermayer
git at videolan.org
Sun Jul 27 22:08:13 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jul 27 21:47:42 2014 +0200| [7f53f1136346c83093219b260d5c95461f64193e] | committer: Michael Niedermayer
Merge commit '42eb9154a83e9a7aedb1168b2f1112af765cf2b5'
* commit '42eb9154a83e9a7aedb1168b2f1112af765cf2b5':
fate: support testing of release branches
Conflicts:
tests/fate.sh
The communication protocol is left at version 0 as our fate server
hasnt been updated to support this yet
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7f53f1136346c83093219b260d5c95461f64193e
---
More information about the ffmpeg-cvslog
mailing list