aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-05-13 00:59:36 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-05-13 00:59:36 +0200
commit2e00dd4d62015efbd87fb1c21daa342b2ec250c5 (patch)
tree5365f3de5f492a087af5198e6316fe201438f8f1
parent91138821fb675883e69f123a5ad86ca8470fb537 (diff)
downloadffmpeg-2e00dd4d62015efbd87fb1c21daa342b2ec250c5.tar.gz
Update for 1.1.5n1.1.5
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 65087b4f5e..e25d8d9f35 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1 +1 @@
-1.1.4
+1.1.5
diff --git a/VERSION b/VERSION
index 65087b4f5e..e25d8d9f35 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.1.4
+1.1.5
diff --git a/doc/Doxyfile b/doc/Doxyfile
index 8216a21efd..d4b93f549c 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 = 1.1.4
+PROJECT_NUMBER = 1.1.5
# With the PROJECT_LOGO tag one can specify an logo or icon that is included
# in the documentation. The maximum height of the logo should not exceed 55