[FFmpeg-cvslog] Merge commit '7c1fe31617699ddefe6b0f39f16e7c3d79e998e2' into release/2.4

Michael Niedermayer git at videolan.org
Mon Mar 9 00:26:36 CET 2015


ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Mon Mar  9 00:14:42 2015 +0100| [d8f6c5a79c10dff1c8e5717d760aec194fb81d9c] | committer: Michael Niedermayer

Merge commit '7c1fe31617699ddefe6b0f39f16e7c3d79e998e2' into release/2.4

* commit '7c1fe31617699ddefe6b0f39f16e7c3d79e998e2':
  Prepare for 11.3 Release

Conflicts:
	RELEASE

Not merged

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

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





More information about the ffmpeg-cvslog mailing list