Conflicts:

	moonitor/control-impl.hpp
	plasmoonitor/control.cpp
	qmoonitor4/qontrol.cpp

Conflicts:

	moonitor/control-impl.hpp

Conflicts:

	plasmoonitor/control.hpp
	plasmoonitor/install_task_widget.cpp
	plasmoonitor/moolbar.cpp
	plasmoonitor/moolbar.hpp
	plasmoonitor/plasmooid.cpp
	plasmoonitor/signal_handler.cpp
	plasmoonitor/typelist.hpp
	plasmoonitor/view.cpp
	plasmoonitor/view.hpp
	plasmoonitor/view_base.hpp
	plasmoonitor/widget_base.hpp
	plasmoonitor/widgetbase.hpp
	qmoonitor/base.hpp
	qmoonitor/emergeinfo.hpp
	qmoonitor/moolbar.cpp
	qmoonitor/status.hpp
	qmoonitor4/install_task_widget.cpp
	qmoonitor4/qontrol.cpp
	qmoonitor4/qontrol.hpp
	qmoonitor4/signal_handler.cpp
	qmoonitor4/view.cpp
	qmoonitor4/widgetbase.hpp