Merge commit '732dd658687bd9a2e5c622e38c481825b57af250'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 16 May 2015 19:14:01 +0000 (21:14 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 16 May 2015 19:14:01 +0000 (21:14 +0200)
* commit '732dd658687bd9a2e5c622e38c481825b57af250':
  doc: Add $branch to FATE config template

Conflicts:
doc/fate.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
doc/fate_config.sh.template

index 1487c1d,0000000..059a1f8
mode 100644,000000..100644
--- /dev/null
@@@ -1,29 -1,0 +1,30 @@@
 +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
 +comment=                                 # optional description
 +build_only=     # set to "yes" for a compile-only instance that skips tests
 +
 +# the following are optional and map to configure options
 +arch=
 +cpu=
 +cross_prefix=
 +as=
 +cc=
 +ld=
 +target_os=
 +sysroot=
 +target_exec=
 +target_path=
 +target_samples=
 +extra_cflags=
 +extra_ldflags=
 +extra_libs=
 +extra_conf=     # extra configure options not covered above
 +
 +#make=          # name of GNU make if not 'make'
 +makeopts=       # extra options passed to 'make'
 +#tar=           # command to create a tar archive from its arguments on stdout,
 +                # defaults to 'tar c'