diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-02 01:53:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-02 02:02:21 +0100 |
| commit | 9c29967ae6916475e8f796c7c0c61c59046feed1 (patch) | |
| tree | ecb67d851da0d11825e2977ab051550871285d0a /COPYING.GPLv2 | |
| parent | 0aa325457dded29682768d945e7d309506e64437 (diff) | |
| parent | 58f0d164def52147e9a9ee4dad9fe8d0d334623f (diff) | |
| download | ffmpeg-9c29967ae6916475e8f796c7c0c61c59046feed1.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Makefile: add html template files to the doxygen deps
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'COPYING.GPLv2')
0 files changed, 0 insertions, 0 deletions