aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-03-06 17:42:36 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-03-06 17:49:22 +0100
commit0d4549c2d6881116079ef6fe8db2cd71c00a1578 (patch)
tree02963d963d8fdfe2f708f9ea4fe6078ca0b65b35
parentc741eb7d882f324260a8484c4919e9a9d8cb7fcd (diff)
downloadffmpeg-0d4549c2d6881116079ef6fe8db2cd71c00a1578.tar.gz
Add 2.6 to maintained releases
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 0bcb6ac150690d1b799982efabc11cab3420f3e3) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--MAINTAINERS1
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 1f434b06d4..8d036c03fa 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -545,6 +545,7 @@ x86 Michael Niedermayer
Releases
========
+2.6 Michael Niedermayer
2.5 Michael Niedermayer
2.4 Michael Niedermayer
2.2 Michael Niedermayer