ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Fri Feb 13 11:51:25 2015 +0100| [c74b3983f99a2a177904bd0b997528c1185e1231] | committer: Michael Niedermayer
Merge commit 'faa8ffda2c513573733624784f0a7d0a4959d33e' * commit 'faa8ffda2c513573733624784f0a7d0a4959d33e': doc/APIchanges: fill in missing dates and hashes Conflicts: doc/APIchanges See: c651a1aaecb5cb7bb40cf40df27f5273e8bcd245 See: 8c8ee17e8d2800144116ec52f26a435a06b49420 and others Merged-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c74b3983f99a2a177904bd0b997528c1185e1231 --- _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog