Skip to content
GitLab
Explore
Sign in
Joao Oliveira
Okular
Repository
okular
kdocumentviewer.h
Find file
Blame
History
Permalink
Merge remote-tracking branch 'origin/master' into frameworks
· 49ce3fc4
Laurent Montel
authored
Aug 03, 2015
Conflicts: core/version.h
49ce3fc4