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

Michael Niedermayer git at videolan.org
Mon Jul 14 23:04:39 CEST 2014


ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Mon Jul 14 22:57:48 2014 +0200| [7c81afdba59f59e2e6d55a1ef72b1f42de8e66fc] | committer: Michael Niedermayer

Merge commit '40dd29653ab85812d21fa64e9a665ceb316701ad' into release/2.2

* commit '40dd29653ab85812d21fa64e9a665ceb316701ad':
  Prepare for 10.2 Release
  Update Changelog for v10.2

Conflicts:
	Changelog
	RELEASE

Not merged as these dont align with our releases

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

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





More information about the ffmpeg-cvslog mailing list