ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Sun Aug 10
20:32:00 2014 +0200| [c24be3c4a2e15e7295bdef8183deb168b6835eb9] | committer:
Michael Niedermayer
Merge commit '59cc0812207e3c2e2f2e559d60d0a8f9296a8847'
* commit '59cc0812207e3c2e2f2e559d60d0a8f9296a8847':
Prepare for 11_alpha2 Release
Conflicts:
RELEASE
Not merged, as our release numbers differ
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c24be3c4a2e15e7295bdef8183deb168b6835eb9
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
