[FFmpeg-cvslog] Merge commit '42eaec076bbe2629c466695f71e7aa283a6fda51' into release/1.1

Michael Niedermayer git at videolan.org
Tue Mar 10 13:45:01 CET 2015


ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 10 13:38:18 2015 +0100| [c5587516ca9155d575b9dd584ea746ebc2e333bd] | committer: Michael Niedermayer

Merge commit '42eaec076bbe2629c466695f71e7aa283a6fda51' into release/1.1

* commit '42eaec076bbe2629c466695f71e7aa283a6fda51':
  Prepare for 9.18 Release

Conflicts:
	RELEASE

not merged

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

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





More information about the ffmpeg-cvslog mailing list