Commit bbd14626 authored by Shawn Sörbom's avatar Shawn Sörbom
Browse files

Merge branch 'deb_KF5_clean'

Conflicts:
	CMakeLists.txt
	NEWS
	README.md
	config.h.cmake
	debian/changelog
	debian/control
	debian/copyright
	debian/rules
	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
parents 3b14110d 65585f01
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment