yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
kwin/packageplugins
History
l10n daemon script c04c285b6a 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-12-03 04:50:14 +01:00
..
aurorae SVN_SILENT made messages (.desktop file) - always resolve ours 2017-12-03 04:50:14 +01:00
decoration SVN_SILENT made messages (.desktop file) - always resolve ours 2017-12-03 04:50:14 +01:00
scripts SVN_SILENT made messages (.desktop file) - always resolve ours 2017-11-06 04:38:04 +01:00
windowswitcher SVN_SILENT made messages (.desktop file) - always resolve ours 2017-11-06 04:38:04 +01:00
CMakeLists.txt