l10n daemon script fe27d39b5c 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-10-17 05:41:38 +02:00
..
declarative-plugin	Use nullptr everywhere	2019-09-19 17:48:21 +03:00
package	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-10-17 05:41:38 +02:00
CMakeLists.txt	Cleanup style in CMakeLists.txt files	2019-09-17 16:03:05 +03:00
decorationmodel.cpp	[decorations] Let KDecoration plugins recommend a border size per default	2019-06-06 22:24:45 +02:00
decorationmodel.h	Run clang-tidy with modernize-use-override check	2019-07-22 20:03:22 +03:00
kcm.cpp	[decorations] Let KDecoration plugins recommend a border size per default	2019-06-06 22:24:45 +02:00
kcm.h	[decorations] Let KDecoration plugins recommend a border size per default	2019-06-06 22:24:45 +02:00
kwindecoration.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-10-17 05:41:38 +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	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-10-17 05:41:38 +02:00