diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-09 19:17:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-09 19:17:22 +0200 |
| commit | eefd6bbee90a13fcb9c6fe7ab4f679c82381799c (patch) | |
| tree | e37331197c6354f3ac5c1d590ba0af9859fd0075 | |
| parent | 514f3e7c02202902badb389904965ca278a0299e (diff) | |
| parent | ce39a84a7d760965972781df61a88e5f432b978a (diff) | |
| download | ffmpeg-eefd6bbee90a13fcb9c6fe7ab4f679c82381799c.tar.gz | |
Merge remote-tracking branch 'qatar/release/0.8' into release/0.10
* qatar/release/0.8:
cmdutils: update copyright year to 2012.
Conflicts:
cmdutils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
0 files changed, 0 insertions, 0 deletions