Commit bb83a5cd authored by Albert Astals Cid's avatar Albert Astals Cid

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

Conflicts:
	VERSION
	core/version.h
parents b89488c6 2cab1c0a
......@@ -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" )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment