[FFmpeg-cvslog] Merge commit 'e4cbd0d6e5a7b3b850d72f4f4ef0124b27dbdcbd' into release/2.2

Michael Niedermayer git at videolan.org
Tue Mar 11 11:39:22 CET 2014


ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 11 11:23:30 2014 +0100| [82c96b5ad88ec2c1342423a6855cd366e788a590] | committer: Michael Niedermayer

Merge commit 'e4cbd0d6e5a7b3b850d72f4f4ef0124b27dbdcbd' into release/2.2

* commit 'e4cbd0d6e5a7b3b850d72f4f4ef0124b27dbdcbd':
  changelog: Cleanups and prepare for v10_beta2

Conflicts:
	Changelog

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=82c96b5ad88ec2c1342423a6855cd366e788a590
---





More information about the ffmpeg-cvslog mailing list