aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-07-10 01:52:51 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-07-10 02:15:43 +0200
commit1ebb95d5f193484e82115410ccb6e192755d551c (patch)
tree02d976bf06bc0df14baf3971c77eabe6d45c8904
parent5eaed6d33689cc6f6e7c07463ede6b387b08afc4 (diff)
downloadffmpeg-1ebb95d5f193484e82115410ccb6e192755d551c.tar.gz
Update for 2.0
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..cd5ac039d6 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1 +1 @@
-1.1.git
+2.0
diff --git a/VERSION b/VERSION
new file mode 100644
index 0000000000..cd5ac039d6
--- /dev/null
+++ b/VERSION
@@ -0,0 +1 @@
+2.0
diff --git a/doc/Doxyfile b/doc/Doxyfile
index f01a305008..bbfbc30c51 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.0
# 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 8d98429dcb..bb6349ef51 100644
--- a/doc/RELEASE_NOTES
+++ b/doc/RELEASE_NOTES
@@ -1,7 +1,7 @@
Release Notes
=============
-* 1.2 "Magic" March, 2013
+* 2.0 "Nameless" July, 2013
General notes