summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-08-31 04:55:35 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-08-31 04:55:35 +0200
commit86bf0a8871dfd447709232fc1f4b48e524c9e6df (patch)
tree432175cfad124d98527c31b4b58bd59b01bb481a
parent558d0b9483d0eecf9718986516c00b696541c693 (diff)
downloadffmpeg-86bf0a8871dfd447709232fc1f4b48e524c9e6df.tar.gz
update for 1.1.6n1.1.6
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 e25d8d9f35..0664a8fd29 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1 +1 @@
-1.1.5
+1.1.6
diff --git a/VERSION b/VERSION
index e25d8d9f35..0664a8fd29 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.1.5
+1.1.6
diff --git a/doc/Doxyfile b/doc/Doxyfile
index d4b93f549c..daf30c05cc 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.5
+PROJECT_NUMBER = 1.1.6
# 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