aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-03-06 17:32:52 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-03-06 17:32:52 +0100
commitc741eb7d882f324260a8484c4919e9a9d8cb7fcd (patch)
treec0edc947a2637ea160731e471b6ea05a2d4f1886
parent0b48ddc5f23068f433b4e68c56556770740e27d8 (diff)
downloadffmpeg-c741eb7d882f324260a8484c4919e9a9d8cb7fcd.tar.gz
Update for 2.6
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--RELEASE2
-rw-r--r--doc/Doxyfile2
2 files changed, 2 insertions, 2 deletions
diff --git a/RELEASE b/RELEASE
index 5db7a1abc4..5154b3f68e 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1 +1 @@
-2.5.git
+2.6
diff --git a/doc/Doxyfile b/doc/Doxyfile
index 8697e6c551..76a2dc9153 100644
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME = FFmpeg
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER =
+PROJECT_NUMBER = 2.6
# With the PROJECT_LOGO tag one can specify a logo or icon that is included
# in the documentation. The maximum height of the logo should not exceed 55