[FFmpeg-cvslog] Merge commit '3e160652219ff4da433f5672ae1e5f4956abb815'
Michael Niedermayer
git at videolan.org
Mon Jan 5 16:03:39 CET 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan 5 02:10:17 2015 +0100| [1d41571bbf0dc1624f8e3b667e9225d43b04019c] | committer: Michael Niedermayer
Merge commit '3e160652219ff4da433f5672ae1e5f4956abb815'
* commit '3e160652219ff4da433f5672ae1e5f4956abb815':
cmdutils: update copyright year to 2015.
Conflicts:
cmdutils.c
See: b8db25a3338b67186837c49580fe538d63dd73c7
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1d41571bbf0dc1624f8e3b667e9225d43b04019c
---
More information about the ffmpeg-cvslog
mailing list