Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-05 06:55:25 +0400
committerMichael Niedermayer <michaelni@gmx.at>2014-03-05 06:55:25 +0400
commite63346f7e8d36f99ec85733823de6d1a0fd31f4f (patch)
treea1fa6b3d39cc1f70982e372b85d3dca237f6bf58
parentddcccababe3492252b3a723c82b6dfc97491677f (diff)
update for 1.2.6n1.2.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 c813fe116c..3c43790f5d 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1 +1 @@
-1.2.5
+1.2.6
diff --git a/VERSION b/VERSION
index c813fe116c..3c43790f5d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.2.5
+1.2.6
diff --git a/doc/Doxyfile b/doc/Doxyfile
index 0736a3d351..e803996a0e 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.2.5
+PROJECT_NUMBER = 1.2.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