github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.

Age	Commit message (Collapse)	Author
2015-05-16	Merge commit '732dd658687bd9a2e5c622e38c481825b57af250'	Michael Niedermayer
	* commit '732dd658687bd9a2e5c622e38c481825b57af250': doc: Add $branch to FATE config template Conflicts: doc/fate.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-29	Merge remote-tracking branch 'qatar/master'	Michael Niedermayer
	* qatar/master: doc: Mention the target_samples and ld variables for fate configs fate.sh: Allow specifying --as via a specific variable Conflicts: doc/fate.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-21	Merge commit 'c209d0df657f172f42d9bafbcdfa02dfb14f6965'	Michael Niedermayer
	* commit 'c209d0df657f172f42d9bafbcdfa02dfb14f6965': fate.sh: add support for build-only FATE instances Conflicts: doc/fate.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-29	doc/fate: Move fate config example into doc subdirectory	Alexander Strasser
	Be compatible with texi2html 5.0 which doesn't search relative file names in search paths anymore. Signed-off-by: Alexander Strasser <eclipse7@gmx.net>