diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-08 14:45:26 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-22 04:04:11 +0100 |
| commit | 2f76f544436e7f77a15a7aa4af255a79a4c20e10 (patch) | |
| tree | 3bed8570010535f767fa2ee1003767f5f67662f9 | |
| parent | faeb2b3e6989c23968434730f8ea371261c3bfc0 (diff) | |
| download | ffmpeg-2f76f544436e7f77a15a7aa4af255a79a4c20e10.tar.gz | |
MAINTAINERS: update for 1.2
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 80f91a70be5f03fc95eb89d222d760eeaf91b135)
Conflicts:
MAINTAINERS
| -rw-r--r-- | MAINTAINERS | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index aa1b5ed6f0..428b2041ba 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -400,8 +400,9 @@ x86 Michael Niedermayer Releases ======== -0.11 Michael Niedermayer -0.10 Michael Niedermayer +1.2 Michael Niedermayer +1.1 Michael Niedermayer +1.0 Michael Niedermayer |