Merge commit '732dd658687bd9a2e5c622e38c481825b57af250'

* commit '732dd658687bd9a2e5c622e38c481825b57af250': doc: Add $branch to FATE config template Conflicts: doc/fate.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago · bd8f2fa525
parent 3fb726c6b4 732dd65868
commit bd8f2fa525
1 changed files with 1 additions and 0 deletions
--- a/doc/fate_config.sh.template
+++ b/doc/fate_config.sh.template
@ -1,5 +1,6 @@
 slot=                                    # some unique identifier
 repo=git://source.ffmpeg.org/ffmpeg.git  # the source repository
+#branch=release/2.6                       # the branch to test
 samples=                                 # path to samples directory
 workdir=                                 # directory in which to do all the work
 #fate_recv="ssh -T fate@fate.ffmpeg.org" # command to submit report