yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
kwin/kcmkwin
History
l10n daemon script d8addb6b3a 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"
2018-06-18 07:25:30 +02:00
..
kwincompositing SVN_SILENT made messages (.desktop file) - always resolve ours 2018-06-18 07:25:30 +02:00
kwindecoration SVN_SILENT made messages (.desktop file) - always resolve ours 2018-06-18 07:25:30 +02:00
kwindesktop SVN_SILENT made messages (.desktop file) - always resolve ours 2017-12-20 07:06:47 +01:00
kwinoptions SVN_SILENT made messages (.desktop file) - always resolve ours 2017-12-28 04:45:41 +01:00
kwinrules Revert "Add "SkipSwitcher" to API" 2018-04-28 09:26:51 +02:00
kwinscreenedges SVN_SILENT made messages (.desktop file) - always resolve ours 2018-06-18 07:25:30 +02:00
kwinscripts SVN_SILENT made messages (.desktop file) - always resolve ours 2018-06-18 07:25:30 +02:00
kwintabbox SVN_SILENT made messages (.desktop file) - always resolve ours 2018-06-18 07:25:30 +02:00
CMakeLists.txt