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

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
parents 62501071 b3c5b52b
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