Merge git://anongit.kde.org/systemd-kcm into upstream
Conflicts: CMakeLists.txt NEWS README.md config.h.cmake other/CMakeLists.txt other/kcm_systemd.desktop src/CMakeLists.txt src/confoption.cpp src/confoption.h src/helper/CMakeLists.txt src/helper/helper.cpp src/helper/helper.h src/helper/kcmsystemd.actions src/kcmsystemd.cpp src/kcmsystemd.h ui/kcmsystemd.ui * Merge changes from new upstream repository
Please register or sign in to comment