[poppler] CMakeLists.txt configure.ac cpp/Doxyfile NEWS qt4/src qt5/src

[Albert Astals Cid]

 CMakeLists.txt   |    4 ++--
 NEWS             |   13 +++++++++++++
 configure.ac     |    4 ++--
 cpp/Doxyfile     |    2 +-
 qt4/src/Doxyfile |    2 +-
 qt5/src/Doxyfile |    2 +-
 6 files changed, 20 insertions(+), 7 deletions(-)

New commits:
commit 9a68daee2b3c7f8a992ee47c0e9ac78b346d4348
Author: Albert Astals Cid <aacid at kde.org>
Date:   Fri Apr 25 01:01:08 2014 +0200

    0.26.0

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e780756..fbafc4e 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 0d19355..fb46164 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 2a49f71..0e703d5 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 e808d24..87d14de 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 3313f7c..73b3bef 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 b10f159..bab1f0f 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.