yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
kwin/kcmkwin
History
l10n daemon script ce5b9c3612 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-06-11 09:38:33 +02:00
..
common [kcmkwin] Make dialog non blocking 2020-04-07 09:27:31 +01:00
kwincompositing SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-11 09:38:33 +02:00
kwindecoration SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-11 09:38:33 +02:00
kwindesktop SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-11 09:38:33 +02:00
kwineffects SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-11 09:38:33 +02:00
kwinoptions SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-11 09:38:33 +02:00
kwinrules SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-11 09:38:33 +02:00
kwinscreenedges SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-11 09:38:33 +02:00
kwinscripts SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-11 09:38:33 +02:00
kwintabbox SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-11 09:38:33 +02:00
CMakeLists.txt