[FFmpeg-cvslog] Merge commit '5a2d1913a96bb0e029b424a4dd5b414cfb91c708' into release/0.10

Michael Niedermayer git at videolan.org
Tue Aug 12 20:35:23 CEST 2014


ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Tue Aug 12 20:25:20 2014 +0200| [257188acea8d93218d5bbfc65593567f1f34b4c2] | committer: Michael Niedermayer

Merge commit '5a2d1913a96bb0e029b424a4dd5b414cfb91c708' into release/0.10

* commit '5a2d1913a96bb0e029b424a4dd5b414cfb91c708':
  Prepare for 0.8.15 Release

Conflicts:
	RELEASE

Not merged

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

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





More information about the ffmpeg-cvslog mailing list