yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
kwin/kcmkwin
History
l10n daemon script ec11cfd04f 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"
2017-07-30 04:57:22 +02:00
..
kwincompositing Merge branch 'Plasma/5.10' 2017-07-28 12:52:31 +01:00
kwindecoration SVN_SILENT made messages (.desktop file) - always resolve ours 2017-06-10 05:41:19 +02:00
kwindesktop SVN_SILENT made messages (.desktop file) - always resolve ours 2017-06-11 04:45:20 +02:00
kwinoptions SVN_SILENT made messages (.desktop file) - always resolve ours 2017-03-25 06:02:34 +01:00
kwinrules SVN_SILENT made messages (.desktop file) - always resolve ours 2017-03-25 06:02:34 +01:00
kwinscreenedges SVN_SILENT made messages (.desktop file) - always resolve ours 2017-07-30 04:57:22 +02:00
kwinscripts Merge branch 'Plasma/5.10' 2017-07-28 12:52:31 +01:00
kwintabbox Merge branch 'Plasma/5.10' 2017-07-28 12:52:31 +01:00
CMakeLists.txt Drop build option KWIN_BUILD_SCREENEDGES 2014-11-24 10:48:49 +01:00