l10n daemon script 8c74b793e0 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-02-11 07:09:43 +01:00
..
idletime
kdecorations	Fix Plastik bottom and right border	2018-01-10 12:11:09 +00:00
kglobalaccel	[autotests] Support new way to run the tests without need to install	2017-11-21 20:34:52 +01:00
platforms	[x11] Fix interactive point selection	2018-02-05 21:21:27 +01:00
qpa
scenes	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-02-11 07:09:43 +01:00
CMakeLists.txt