yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
kwin/kcmkwin
History
l10n daemon script 1ddcf8645f 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-01-16 06:10:12 +01:00
..
kwincompositing SVN_SILENT made messages (.desktop file) - always resolve ours 2017-01-16 06:10:12 +01:00
kwindecoration Restore global menu support 2017-01-11 10:21:03 +01:00
kwindesktop SVN_SILENT made messages (.desktop file) - always resolve ours 2016-12-20 13:30:44 +01:00
kwinoptions SVN_SILENT made messages (.desktop file) - always resolve ours 2016-12-20 13:30:44 +01:00
kwinrules SVN_SILENT made messages (.desktop file) - always resolve ours 2016-12-20 13:30:44 +01:00
kwinscreenedges SVN_SILENT made messages (.desktop file) - always resolve ours 2016-12-20 13:30:44 +01:00
kwinscripts SVN_SILENT made messages (.desktop file) - always resolve ours 2017-01-16 06:10:12 +01:00
kwintabbox SVN_SILENT made messages (.desktop file) - always resolve ours 2017-01-15 06:12:16 +01:00
CMakeLists.txt