[FFmpeg-cvslog] Merge commit '56a721f020273d69daa8dcb0d99e42a43a0a0d4d'
Michael Niedermayer
git at videolan.org
Tue Aug 26 20:53:33 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Aug 26 20:48:07 2014 +0200| [ffa90d99fd8933b17917045a3768bb9dcfb56f72] | committer: Michael Niedermayer
Merge commit '56a721f020273d69daa8dcb0d99e42a43a0a0d4d'
* commit '56a721f020273d69daa8dcb0d99e42a43a0a0d4d':
doc: fix a typo
Conflicts:
doc/APIchanges
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ffa90d99fd8933b17917045a3768bb9dcfb56f72
---
More information about the ffmpeg-cvslog
mailing list