summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlbert Astals Cid <aacid@kde.org>2014-04-25 01:01:08 +0200
committerAlbert Astals Cid <aacid@kde.org>2014-04-25 01:01:08 +0200
commit9a68daee2b3c7f8a992ee47c0e9ac78b346d4348 (patch)
treefb694f9678b4b07531dc24c9ae8fcb8f7e3b75c6
parent8073852c84b71257d487aa8a46e441aa82f4b42c (diff)
-rw-r--r--CMakeLists.txt4
-rw-r--r--NEWS13
-rw-r--r--configure.ac4
-rw-r--r--cpp/Doxyfile2
-rw-r--r--qt4/src/Doxyfile2
-rw-r--r--qt5/src/Doxyfile2
6 files changed, 20 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e780756b..fbafc4e5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,8 +17,8 @@ include(CheckFileOffsetBits)
CHECK_FILE_OFFSET_BITS()
set(POPPLER_MAJOR_VERSION "0")
-set(POPPLER_MINOR_VERSION "25")
-set(POPPLER_MICRO_VERSION "3")
+set(POPPLER_MINOR_VERSION "26")
+set(POPPLER_MICRO_VERSION "0")
set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
# command line switches
diff --git a/NEWS b/NEWS
index 0d19355f..fb461641 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,16 @@
+Release 0.26.0
+ qt4:
+ * Fix mismatched boolean logic in TextAnnotation::setInplaceIntent
+
+ qt5:
+ * Fix mismatched boolean logic in TextAnnotation::setInplaceIntent
+
+ core:
+ * Very small code cleanup
+
+ cpp:
+ * Very small code cleanup
+
Release 0.25.3
core:
* Fix crashes on broken files
diff --git a/configure.ac b/configure.ac
index 2a49f71d..0e703d5f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
m4_define([poppler_version_major],[0])
-m4_define([poppler_version_minor],[25])
-m4_define([poppler_version_micro],[3])
+m4_define([poppler_version_minor],[26])
+m4_define([poppler_version_micro],[0])
m4_define([poppler_version],[poppler_version_major.poppler_version_minor.poppler_version_micro])
AC_PREREQ(2.59)
diff --git a/cpp/Doxyfile b/cpp/Doxyfile
index e808d246..87d14de5 100644
--- a/cpp/Doxyfile
+++ b/cpp/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME = "Poppler CPP"
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = 0.25.3
+PROJECT_NUMBER = 0.26.0
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
diff --git a/qt4/src/Doxyfile b/qt4/src/Doxyfile
index 3313f7c6..73b3bef9 100644
--- a/qt4/src/Doxyfile
+++ b/qt4/src/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME = "Poppler Qt4 "
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = 0.25.3
+PROJECT_NUMBER = 0.26.0
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
diff --git a/qt5/src/Doxyfile b/qt5/src/Doxyfile
index b10f1594..bab1f0f7 100644
--- a/qt5/src/Doxyfile
+++ b/qt5/src/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME = "Poppler Qt5"
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = 0.25.3
+PROJECT_NUMBER = 0.26.0
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.