kwin/kcmkwin/kwindecoration
l10n daemon script 93ab16b995 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-07-18 05:28:09 +02:00
..
declarative-plugin Don't use deprecated QPalette::background() 2019-07-10 22:49:40 +03:00
package SVN_SILENT made messages (.desktop file) - always resolve ours 2019-07-18 05:28:09 +02:00
CMakeLists.txt Move knsrc files to the new location 2019-05-17 18:56:27 +02:00
decorationmodel.cpp [decorations] Let KDecoration plugins recommend a border size per default 2019-06-06 22:24:45 +02:00
decorationmodel.h [decorations] Let KDecoration plugins recommend a border size per default 2019-06-06 22:24:45 +02: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-07-18 05:28:09 +02:00
Messages.sh
utils.cpp
utils.h
window-decorations.knsrc [kcmkwin/kwindecoration] Fix Get Hot New Stuff 2019-02-12 16:21:11 +01:00