aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-15 03:08:20 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-03-15 03:08:20 +0100
commit6ba07e9948d5c9bcb7a0f270f150fbb2f99074e1 (patch)
treedf7c58ed9711ab510af90b10a4974bae60893c44
parent125bea15d1f6248f4eb2131add7fc11e636f9455 (diff)
downloadffmpeg-6ba07e9948d5c9bcb7a0f270f150fbb2f99074e1.tar.gz
update for 2.2-rc2n2.2-rc2
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--RELEASE2
-rw-r--r--VERSION2
-rw-r--r--doc/Doxyfile2
3 files changed, 3 insertions, 3 deletions
diff --git a/RELEASE b/RELEASE
index bd861e1397..749c29f4c7 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1 +1 @@
-2.2-rc1
+2.2-rc2
diff --git a/VERSION b/VERSION
index bd861e1397..749c29f4c7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.2-rc1
+2.2-rc2
diff --git a/doc/Doxyfile b/doc/Doxyfile
index 40840026c9..d39e0574a6 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 = 2.2-rc1
+PROJECT_NUMBER = 2.2-rc2
# 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