diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-16 21:14:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-16 21:14:01 +0200 |
| commit | bd8f2fa525f05144f4457c9836376c1cd1e0673f (patch) | |
| tree | 4c1856e4ec13416c52b184c1aa4d228375f261ab | |
| parent | 3fb726c6b4772594365271046d11c87ae8417bde (diff) | |
| parent | 732dd658687bd9a2e5c622e38c481825b57af250 (diff) | |
| download | ffmpeg-bd8f2fa525f05144f4457c9836376c1cd1e0673f.tar.gz | |
Merge commit '732dd658687bd9a2e5c622e38c481825b57af250'
* commit '732dd658687bd9a2e5c622e38c481825b57af250':
doc: Add $branch to FATE config template
Conflicts:
doc/fate.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | doc/fate_config.sh.template | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/fate_config.sh.template b/doc/fate_config.sh.template index 1487c1d2ef..059a1f862f 100644 --- 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 |