office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-10-12 10:53:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
And prepare for 4.14 beta 1

Conflicts:
	VERSION
	active/app/package/metadata.desktop
	core/version.h
This commit is contained in:
Albert Astals Cid 2014-07-09 01:40:18 +02:00
parent d62def2323 478b41c365
commit 1932d3981b
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
VERSION
View file

@ -1 +1 @@
okular v0.19.60
okular v0.19.80

4
core/version.h
View file

@ -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 \