yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
kwin/packageplugins
History
l10n daemon script 150a7bc50b 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-02-05 07:52:17 +01:00
..
scripts SVN_SILENT made messages (.desktop file) - always resolve ours 2017-02-05 07:52:17 +01:00
windowswitcher SVN_SILENT made messages (.desktop file) - always resolve ours 2017-02-05 07:52:17 +01:00
CMakeLists.txt