Skip to content
GitLab
Explore
Sign in
John Zhang
Okular
Repository
okular
part.h
Find file
Blame
History
Permalink
Merge branch 'master' into dont-use-docdata-for-annots-and-forms
· 288f87f1
Fabio D'Urso
authored
Sep 08, 2014
Conflicts: core/document.cpp core/document_p.h part.cpp part.h
288f87f1