Skip to content
GitLab
Explore
Sign in
Joao Oliveira
Okular
Repository
okular
core
fileprinter.h
Find file
Blame
History
Permalink
Merge remote-tracking branch 'origin/master' into frameworks
· d780d15e
Laurent Montel
authored
Mar 17, 2015
Conflicts: autotests/mainshelltest.cpp part.cpp part.h shell/shell.cpp
d780d15e