aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-01-06 21:54:19 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-01-06 22:42:56 +0100
commit79013a59c0605472fe941ca9ff01324c1320f874 (patch)
tree89f2f8baef15e2179a3bc5b340fae44121ad02d4
parent58edabb198e0c881d8bb6ae8a88df037c24c71eb (diff)
downloadffmpeg-n1.1.tar.gz
update for 1.1n1.1
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--RELEASE2
-rw-r--r--VERSION1
-rw-r--r--doc/Doxyfile2
-rw-r--r--doc/RELEASE_NOTES2
4 files changed, 4 insertions, 3 deletions
diff --git a/RELEASE b/RELEASE
index 3d529fb483..9459d4ba2a 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1 +1 @@
-1.1.git
+1.1
diff --git a/VERSION b/VERSION
new file mode 100644
index 0000000000..b123147e2a
--- /dev/null
+++ b/VERSION
@@ -0,0 +1 @@
+1.1 \ No newline at end of file
diff --git a/doc/Doxyfile b/doc/Doxyfile
index 7e6d0f56fd..d84dccffe5 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 = 1.1
# 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
diff --git a/doc/RELEASE_NOTES b/doc/RELEASE_NOTES
index f71f18a3aa..4c209ecb5e 100644
--- a/doc/RELEASE_NOTES
+++ b/doc/RELEASE_NOTES
@@ -1,7 +1,7 @@
Release Notes
=============
-* 0.10 "Freedom" January, 2012
+* 1.1 "Fire Flower" January, 2013
General notes