l10n daemon script 36e3632101 SVN_SILENT made messages (.desktop file) - always resolve ours ... In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"		2018-01-28 06:53:21 +01:00
..
idletime
kdecorations	Fix Plastik bottom and right border	2018-01-10 12:11:09 +00:00
kglobalaccel
platforms	[libinput] Find screen for touch screen devices and calibrate accordingly	2017-12-23 10:18:55 +01:00
qpa
scenes	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-01-28 06:53:21 +01:00
CMakeLists.txt