diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-08 14:45:26 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-21 01:01:53 +0100 |
| commit | e45f0f0f667b8f779f3ded068f773676a095bcb5 (patch) | |
| tree | 1556ba78c8463356a6e371905bfd2d608281617f | |
| parent | becde6ab1c383e6774285e635b41dc21177a4b16 (diff) | |
| download | ffmpeg-e45f0f0f667b8f779f3ded068f773676a095bcb5.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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index b361543c0c..7648edc204 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -408,9 +408,9 @@ x86 Michael Niedermayer Releases ======== +1.2 Michael Niedermayer +1.1 Michael Niedermayer 1.0 Michael Niedermayer -0.11 Michael Niedermayer -0.10 Michael Niedermayer |