[FFmpeg-cvslog] Merge commit '4c1e4bc6af1596995e895cd7da9f3b436051114c' into release/1.1

Michael Niedermayer git at videolan.org
Mon Apr 21 14:32:02 CEST 2014


ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 21 14:24:15 2014 +0200| [238532700e841dd06cdd2d66f5842227838f73ba] | committer: Michael Niedermayer

Merge commit '4c1e4bc6af1596995e895cd7da9f3b436051114c' into release/1.1

* commit '4c1e4bc6af1596995e895cd7da9f3b436051114c':
  Prepare for 9.13 Release

Conflicts:
	RELEASE

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

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





More information about the ffmpeg-cvslog mailing list