[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'
Michael Niedermayer
git at videolan.org
Fri Jul 19 11:36:11 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jul 19 11:08:38 2013 +0200| [25ffaf52770253a5bfce353dc3d30637664e5e60] | committer: Michael Niedermayer
Merge remote-tracking branch 'qatar/master'
* qatar/master:
compat: Add missing license boilerplates
Conflicts:
compat/tms470/math.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=25ffaf52770253a5bfce353dc3d30637664e5e60
---
More information about the ffmpeg-cvslog
mailing list