l10n daemon script c62650394f 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"		2019-05-31 05:14:47 +02:00
..
declarative-plugin	Update URLs to use https	2019-03-25 19:26:23 +01:00
package	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-05-31 05:14:47 +02:00
CMakeLists.txt	Move knsrc files to the new location	2019-05-17 18:56:27 +02:00
decorationmodel.cpp	[kcmkwin/kwindecoration] Rewrite the KWin decorations settings as a ConfigModule	2019-02-10 13:01:04 +01:00
decorationmodel.h	[kcmkwin/kwindecoration] Rewrite the KWin decorations settings as a ConfigModule	2019-02-10 13:01:04 +01:00
kcm.cpp	Resurrect show tooltips option	2019-03-05 00:38:55 +02:00
kcm.h	Resurrect show tooltips option	2019-03-05 00:38:55 +02:00
kwindecoration.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-05-31 05:14:47 +02:00
Messages.sh	Merge branch 'Plasma/5.15'	2019-02-12 08:56:17 +01:00
utils.cpp	[kcmkwin/kwindecoration] Rewrite the KWin decorations settings as a ConfigModule	2019-02-10 13:01:04 +01:00
utils.h	[kcmkwin/kwindecoration] Rewrite the KWin decorations settings as a ConfigModule	2019-02-10 13:01:04 +01:00
window-decorations.knsrc	[kcmkwin/kwindecoration] Fix Get Hot New Stuff	2019-02-12 16:21:11 +01:00