kwin/kcmkwin
l10n daemon script 8c7956b923 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"
2020-04-23 06:36:52 +02:00
..
common [kcmkwin] Remove redundant lambda 2020-03-30 19:39:09 +03:00
kwincompositing GIT_SILENT Fix scripty failing 2020-04-21 23:11:15 +02:00
kwindecoration SVN_SILENT made messages (.desktop file) - always resolve ours 2020-03-27 06:43:00 +01:00
kwindesktop Merge branch 'Plasma/5.18' 2020-03-29 18:17:54 -06:00
kwineffects SVN_SILENT made messages (.desktop file) - always resolve ours 2020-03-27 06:43:00 +01:00
kwinoptions Reduce the amount of objects that are compiled several times 2020-04-02 00:41:55 +02:00
kwinrules SVN_SILENT made messages (.desktop file) - always resolve ours 2020-04-23 06:36:52 +02:00
kwinscreenedges KCM KWinScreenEdges disable widgets if is immutable 2020-04-22 11:10:17 +02:00
kwinscripts kcmkwin/scripts: make default button work 2020-03-13 11:08:56 +01:00
kwintabbox KCM KWinTabbox disable widget if property is immutable. 2020-04-14 14:08:36 +02:00
CMakeLists.txt