yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
kwin/kcmkwin
History
l10n daemon script 91002a6386 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-04-08 06:02:43 +02:00
..
kwincompositing SVN_SILENT made messages (.desktop file) - always resolve ours 2017-04-08 06:02:43 +02:00
kwindecoration Fix crash on dragging titlebar buttons in System Settings 2017-03-24 17:04:09 +01:00
kwindesktop SVN_SILENT made messages (.desktop file) - always resolve ours 2017-03-22 05:17:38 +01:00
kwinoptions SVN_SILENT made messages (.desktop file) - always resolve ours 2017-03-22 05:17:38 +01:00
kwinrules SVN_SILENT made messages (.desktop file) - always resolve ours 2017-03-22 05:17:38 +01:00
kwinscreenedges SVN_SILENT made messages (.desktop file) - always resolve ours 2017-03-22 05:17:38 +01:00
kwinscripts SVN_SILENT made messages (.desktop file) - always resolve ours 2017-04-08 06:02:43 +02:00
kwintabbox SVN_SILENT made messages (.desktop file) - always resolve ours 2017-04-08 06:02:43 +02:00
CMakeLists.txt