ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Thu Sep 4
20:50:01 2014 +0200| [53b089200557b299174bec72415b166ad43083a6] | committer:
Michael Niedermayer
Merge commit 'd9792b773516a560ecb99694b8ee745a50027fac'
* commit 'd9792b773516a560ecb99694b8ee745a50027fac':
Mark 11 release in the changelog
Conflicts:
Changelog
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=53b089200557b299174bec72415b166ad43083a6
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
