Merge remote-tracking branch 'origin/KDE/4.10'

Conflicts: VERSION core/version.h
13 years ago · bb83a5cdba
parent b89488c6ba 2cab1c0a42
commit bb83a5cdba
1 changed files with 1 additions and 1 deletions
--- a/generators/poppler/generator_pdf.cpp
+++ b/generators/poppler/generator_pdf.cpp
@ -400,7 +400,7 @@ static KAboutData createAboutData()
         "okular_poppler",
         "okular_poppler",
         ki18n( "PDF Backend" ),
-         "0.6.2",
+         "0.6.3",
         ki18n( "A PDF file renderer" ),
         KAboutData::License_GPL,
         ki18n( "© 2005-2008 Albert Astals Cid" )