Commit 1932d398 authored by Albert Astals Cid's avatar Albert Astals Cid

Merge remote-tracking branch 'origin/KDE/4.13' into KDE/4.14

And prepare for 4.14 beta 1

Conflicts:
	VERSION
	active/app/package/metadata.desktop
	core/version.h
parents d62def23 478b41c3
okular v0.19.60
okular v0.19.80
......@@ -10,10 +10,10 @@
#ifndef _OKULAR_VERSION_H_
#define _OKULAR_VERSION_H_
#define OKULAR_VERSION_STRING "0.19.60"
#define OKULAR_VERSION_STRING "0.19.80"
#define OKULAR_VERSION_MAJOR 0
#define OKULAR_VERSION_MINOR 19
#define OKULAR_VERSION_RELEASE 60
#define OKULAR_VERSION_RELEASE 80
#define OKULAR_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c))
#define OKULAR_VERSION \
......
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