[FFmpeg-cvslog] Merge commit '732dd658687bd9a2e5c622e38c481825b57af250'

Michael Niedermayer git at videolan.org
Sat May 16 21:22:32 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat May 16 21:14:01 2015 +0200| [bd8f2fa525f05144f4457c9836376c1cd1e0673f] | committer: Michael Niedermayer

Merge commit '732dd658687bd9a2e5c622e38c481825b57af250'

* commit '732dd658687bd9a2e5c622e38c481825b57af250':
  doc: Add $branch to FATE config template

Conflicts:
	doc/fate.texi

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

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





More information about the ffmpeg-cvslog mailing list