kwin/kcmkwin
l10n daemon script 390bad1ed8 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"
2016-04-11 10:23:59 +00:00
..
kwincompositing SVN_SILENT made messages (.desktop file) - always resolve ours 2016-04-11 10:23:59 +00:00
kwindecoration Testing whether m_lastCreatedSettings is not null before calling its method 2016-04-08 09:26:48 +02:00
kwindesktop Port to CMake AUTOMOC 2016-02-01 21:05:36 +01:00
kwinoptions Port to CMake AUTOMOC 2016-02-01 21:05:36 +01:00
kwinrules [Window Rules] Fix simple shortcut not being transfered to text field 2016-03-21 10:28:44 +01:00
kwinscreenedges Port to CMake AUTOMOC 2016-02-01 21:05:36 +01:00
kwinscripts SVN_SILENT made messages (.desktop file) - always resolve ours 2016-01-30 09:40:55 +00:00
kwintabbox SVN_SILENT made messages (.desktop file) - always resolve ours 2016-01-10 11:46:53 +00:00
CMakeLists.txt Drop build option KWIN_BUILD_SCREENEDGES 2014-11-24 10:48:49 +01:00