yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
kwin/kcmkwin
History
l10n daemon script 3deb48b252 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-06-25 05:43:31 +02:00
..
kwincompositing SVN_SILENT made messages (.desktop file) - always resolve ours 2017-06-23 05:46:51 +02: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-03-25 06:02:34 +01: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-06-25 05:43:31 +02:00
kwinscripts SVN_SILENT made messages (.desktop file) - always resolve ours 2017-06-23 05:46:51 +02:00
kwintabbox SVN_SILENT made messages (.desktop file) - always resolve ours 2017-06-23 05:46:51 +02:00
CMakeLists.txt