[FFmpeg-cvslog] Merge commit 'a2eeed619de3bb257e82f0e06d1a580101bce54c'
Michael Niedermayer
git at videolan.org
Thu Dec 12 20:06:26 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Dec 12 19:55:06 2013 +0100| [93cf43ec3febaddfb34522bbcc2f04038c8e6e9e] | committer: Michael Niedermayer
Merge commit 'a2eeed619de3bb257e82f0e06d1a580101bce54c'
* commit 'a2eeed619de3bb257e82f0e06d1a580101bce54c':
changelog: drop redundant new attribute
Conflicts:
Changelog
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=93cf43ec3febaddfb34522bbcc2f04038c8e6e9e
---
More information about the ffmpeg-cvslog
mailing list