Skip to content
GitLab
Explore
Sign in
PIM
KDE PIM Runtime
Repository
kdepim-runtime
resources
CMakeLists.txt
Find file
Blame
History
Permalink
Merge remote-tracking branch 'origin/master' into frameworks
· 4d04e2d4
Laurent Montel
authored
May 09, 2014
Conflicts: resources/CMakeLists.txt resources/kolab/CMakeLists.txt
4d04e2d4