Diffusion Plasma Desktop a4f2c30526db

5.13'
a4f2c30526db
Actions

Authored by ltoscano on May 30 2018, 8:01 PM.

Description

Merge remote-tracking branch 'origin/Plasma/5.13'

Details

Committed

ltoscano

May 30 2018, 8:01 PM

Parents

R119:8f7a827f7017: Rename kcm_input to kcm_mouse
R119:ed76e11a623d: [Baloo KCM] Prevent duplicate paths in the config file.

Branches

Unknown

Tags

Unknown

ltoscano committed R119:a4f2c30526db: Merge remote-tracking branch 'origin/Plasma/5.13' (authored by ltoscano).May 30 2018, 8:01 PM

Merged Changes

Commit		Author	Details	Committed
8f7a827f7017	D13193	volkov	Rename kcm_input to kcm_mouse	May 30 2018
9d5bdcb11638	D13022	lueck	add workspaceoptions docbook	May 29 2018
62553f63beca	D12990	lueck	update mouse kcm docbook to 5.13	May 29 2018
64a1d9f9cdc0		smithjd	[Baloo KCM] Prevent duplicate paths in the config file.	May 29 2018
6fc153d1ac38		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	May 29 2018

Changes (120)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		Path
M		CMakeLists.txt
M		kcms/CMakeLists.txt
D		kcms/input
V		kcms/{input → mouse}/CMakeLists.txt
V		kcms/{input → mouse}/Messages.sh
D		kcms/input/backends
D		kcms/input/backends/kwin_wl
V		kcms/{input → mouse}/backends/kwin_wl.cmake
V		kcms/{input → mouse}/backends/kwin_wl/kwin_wl_backend.cpp
V		kcms/{input → mouse}/backends/kwin_wl/kwin_wl_backend.h
V		kcms/{input → mouse}/backends/kwin_wl/kwin_wl_device.cpp
V		kcms/{input → mouse}/backends/kwin_wl/kwin_wl_device.h
D		kcms/input/backends/x11
V		kcms/{input → mouse}/backends/x11.cmake
V		kcms/{input → mouse}/backends/x11/evdev_settings.cpp
V		kcms/{input → mouse}/backends/x11/evdev_settings.h
V		kcms/{input → mouse}/backends/x11/libinput_settings.cpp
V		kcms/{input → mouse}/backends/x11/libinput_settings.h
V		kcms/{input → mouse}/backends/x11/x11_backend.cpp
V		kcms/{input → mouse}/backends/x11/x11_backend.h
V		kcms/{input → mouse}/backends/x11/x11_evdev_backend.cpp
V		kcms/{input → mouse}/backends/x11/x11_evdev_backend.h
V		kcms/{input → mouse}/backends/x11/x11_libinput_backend.cpp
V		kcms/{input → mouse}/backends/x11/x11_libinput_backend.h
V		kcms/{input → mouse}/backends/x11/x11_libinput_dummydevice.cpp
V		kcms/{input → mouse}/backends/x11/x11_libinput_dummydevice.h
V		kcms/{input → mouse}/inputbackend.cpp
V		kcms/{input → mouse}/inputbackend.h
V		kcms/{input → mouse}/kapplymousetheme.cpp
D		kcms/input/kcm
V		kcms/{input → mouse}/kcm/configcontainer.cpp
V		kcms/{input → mouse}/kcm/configcontainer.h
V		kcms/{input → mouse}/kcm/configplugin.cpp
V		kcms/{input → mouse}/kcm/configplugin.h
V	(dir)	kcms/{input/kcm/libinput/ → mouse/kcm/libinput}
V	(dir)	kcms/{input/kcm/libinput/components/ → mouse/kcm/libinput/components}
V		kcms/{input → mouse}/kcm/libinput/components/ExclGroupBox.qml
V		kcms/{input → mouse}/kcm/libinput/components/ToolTip.qml
V		kcms/{input → mouse}/kcm/libinput/libinput_config.cpp
V		kcms/{input → mouse}/kcm/libinput/libinput_config.h
V		kcms/{input → mouse}/kcm/libinput/main.qml
V		kcms/{input → mouse}/kcm/libinput/main_deviceless.qml
V		kcms/{input → mouse}/kcm/resources.qrc
D		kcms/input/kcm/xlib
V		kcms/{input → mouse}/kcm/xlib/kcmmouse.ui
V		kcms/{input → mouse}/kcm/xlib/xlib_config.cpp
V		kcms/{input → mouse}/kcm/xlib/xlib_config.h
D		kcms/input/misc
V		kcms/{input → mouse}/misc/CMakeLists.txt
V		kcms/{input → mouse}/misc/consoleUserPerms
V		kcms/{input → mouse}/misc/cursor_large.bdf
V		kcms/{input → mouse}/misc/cursor_large_black.pcf.gz
V		kcms/{input → mouse}/misc/cursor_large_white.pcf.gz
V		kcms/{input → mouse}/misc/cursor_small_white.pcf.gz
V		kcms/{input → mouse}/misc/mouse_lh.png
V		kcms/{input → mouse}/misc/mouse_lh.svgz
V		kcms/{input → mouse}/misc/mouse_rh.png
V		kcms/{input → mouse}/misc/mouse_rh.svgz
V		kcms/{input → mouse}/mouse.desktop
V		kcms/{input → mouse}/plugin.cpp
V		kcms/{input → mouse}/plugin.h
A	(dir)	kcms/mouse/
V		kcms/{mouse ← input}/CMakeLists.txt
V		kcms/{mouse ← input}/Messages.sh
A	(dir)	kcms/mouse/backends/
A	(dir)	kcms/mouse/backends/kwin_wl/
V		kcms/{mouse ← input}/backends/kwin_wl.cmake
V		kcms/{mouse ← input}/backends/kwin_wl/kwin_wl_backend.cpp
V		kcms/{mouse ← input}/backends/kwin_wl/kwin_wl_backend.h
V		kcms/{mouse ← input}/backends/kwin_wl/kwin_wl_device.cpp
V		kcms/{mouse ← input}/backends/kwin_wl/kwin_wl_device.h
A	(dir)	kcms/mouse/backends/x11/
V		kcms/{mouse ← input}/backends/x11.cmake
V		kcms/{mouse ← input}/backends/x11/evdev_settings.cpp
V		kcms/{mouse ← input}/backends/x11/evdev_settings.h
V		kcms/{mouse ← input}/backends/x11/libinput_settings.cpp
V		kcms/{mouse ← input}/backends/x11/libinput_settings.h
V		kcms/{mouse ← input}/backends/x11/x11_backend.cpp
V		kcms/{mouse ← input}/backends/x11/x11_backend.h
V		kcms/{mouse ← input}/backends/x11/x11_evdev_backend.cpp
V		kcms/{mouse ← input}/backends/x11/x11_evdev_backend.h
V		kcms/{mouse ← input}/backends/x11/x11_libinput_backend.cpp
V		kcms/{mouse ← input}/backends/x11/x11_libinput_backend.h
V		kcms/{mouse ← input}/backends/x11/x11_libinput_dummydevice.cpp
V		kcms/{mouse ← input}/backends/x11/x11_libinput_dummydevice.h
V		kcms/{mouse ← input}/inputbackend.cpp
V		kcms/{mouse ← input}/inputbackend.h
V		kcms/{mouse ← input}/kapplymousetheme.cpp
A	(dir)	kcms/mouse/kcm/
V		kcms/{mouse ← input}/kcm/configcontainer.cpp
V		kcms/{mouse ← input}/kcm/configcontainer.h
V		kcms/{mouse ← input}/kcm/configplugin.cpp
V		kcms/{mouse ← input}/kcm/configplugin.h
V	(dir)	kcms/{mouse/kcm/libinput/ ← input/kcm/libinput}
V	(dir)	kcms/{mouse/kcm/libinput/components/ ← input/kcm/libinput/components}
V		kcms/{mouse ← input}/kcm/libinput/components/ExclGroupBox.qml
V		kcms/{mouse ← input}/kcm/libinput/components/ToolTip.qml
V		kcms/{mouse ← input}/kcm/libinput/libinput_config.cpp
V		kcms/{mouse ← input}/kcm/libinput/libinput_config.h
V		kcms/{mouse ← input}/kcm/libinput/main.qml
V		kcms/{mouse ← input}/kcm/libinput/main_deviceless.qml
V		kcms/{mouse ← input}/kcm/resources.qrc
A	(dir)	kcms/mouse/kcm/xlib/
V		kcms/{mouse ← input}/kcm/xlib/kcmmouse.ui
V		kcms/{mouse ← input}/kcm/xlib/xlib_config.cpp
V		kcms/{mouse ← input}/kcm/xlib/xlib_config.h
A	(dir)	kcms/mouse/misc/
V		kcms/{mouse ← input}/misc/CMakeLists.txt
V		kcms/{mouse ← input}/misc/consoleUserPerms
V		kcms/{mouse ← input}/misc/cursor_large.bdf
V		kcms/{mouse ← input}/misc/cursor_large_black.pcf.gz
V		kcms/{mouse ← input}/misc/cursor_large_white.pcf.gz
V		kcms/{mouse ← input}/misc/cursor_small_white.pcf.gz
V		kcms/{mouse ← input}/misc/mouse_lh.png
V		kcms/{mouse ← input}/misc/mouse_lh.svgz
V		kcms/{mouse ← input}/misc/mouse_rh.png
V		kcms/{mouse ← input}/misc/mouse_rh.svgz
V		kcms/{mouse ← input}/mouse.desktop
V		kcms/{mouse ← input}/plugin.cpp
V		kcms/{mouse ← input}/plugin.h