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

Conflicts: VERSION core/version.h
12 years ago · 6bb402a9e5
parent dc1fb2fc7a d2d4528bea
commit 6bb402a9e5
2 changed files with 2 additions and 2 deletions
--- a/generators/epub/generator_epub.cpp
+++ b/generators/epub/generator_epub.cpp
@ -20,7 +20,7 @@ static KAboutData createAboutData()
                       "okular_epub",
                       "okular_epub",
                       ki18n("EPub Backend"),
-                       "0.2.1",
+                       "0.2.2",
                       ki18n("An EPub backend"),
                       KAboutData::License_GPL,
                       ki18n("© 2008 Ely Levy")
--- a/generators/kimgio/generator_kimgio.cpp
+++ b/generators/kimgio/generator_kimgio.cpp
@ -33,7 +33,7 @@ static KAboutData createAboutData()
         "okular_kimgio",
         "okular_kimgio",
         ki18n( "Image Backend" ),
-         "0.1.1",
+         "0.1.2",
         ki18n( "A simple image backend" ),
         KAboutData::License_GPL,
         ki18n( "© 2005, 2009 Albert Astals Cid\n"