git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
faeb2b3
)
MAINTAINERS: update for 1.2
author
Michael Niedermayer
<michaelni@gmx.at>
Fri, 8 Mar 2013 13:45:26 +0000
(14:45 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Fri, 22 Mar 2013 03:04:11 +0000
(
04:04
+0100)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
80f91a70be5f03fc95eb89d222d760eeaf91b135
)
Conflicts:
MAINTAINERS
MAINTAINERS
patch
|
blob
|
history
diff --git
a/MAINTAINERS
b/MAINTAINERS
index
aa1b5ed
..
428b204
100644
(file)
--- 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