Merge commit '711c4da1af71e0d26ca93626a3c2dd48821f1cc7'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Jul 2013 09:13:34 +0000 (11:13 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Jul 2013 09:13:34 +0000 (11:13 +0200)
commitdc737f0bfa80c395d265bd4d9e4faf2ba4170bd6
treeeab9c8b54bb6f2a60847e6861758aab7f3232352
parent1f5755d869b5e9769be6990b3732aee1d8878e66
parent711c4da1af71e0d26ca93626a3c2dd48821f1cc7
Merge commit '711c4da1af71e0d26ca93626a3c2dd48821f1cc7'

* commit '711c4da1af71e0d26ca93626a3c2dd48821f1cc7':
  fate: Add tree test

Conflicts:
tests/fate/libavutil.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tests/fate/libavutil.mak