yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
kwin/kcmkwin
History
l10n daemon script c855555903 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"
2016-12-13 04:11:59 +01:00
..
kwincompositing SVN_SILENT made messages (.desktop file) - always resolve ours 2016-12-13 04:11:59 +01:00
kwindecoration SVN_SILENT made messages (.desktop file) - always resolve ours 2016-12-13 04:11:59 +01:00
kwindesktop SVN_SILENT made messages (.desktop file) - always resolve ours 2016-12-13 04:11:59 +01:00
kwinoptions SVN_SILENT made messages (.desktop file) - always resolve ours 2016-12-13 04:11:59 +01:00
kwinrules SVN_SILENT made messages (.desktop file) - always resolve ours 2016-12-13 04:11:59 +01:00
kwinscreenedges SVN_SILENT made messages (.desktop file) - always resolve ours 2016-12-13 04:11:59 +01:00
kwinscripts Use KPackage in kcmscripts 2016-10-07 13:27:19 +01:00
kwintabbox SVN_SILENT made messages (.desktop file) - always resolve ours 2016-12-13 04:11:59 +01:00
CMakeLists.txt