yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
kwin/plugins/platforms
History
l10n daemon script 966775d609 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-11-25 05:07:25 +01:00
..
drm SVN_SILENT made messages (.desktop file) - always resolve ours 2016-11-25 05:07:25 +01:00
fbdev SVN_SILENT made messages (.desktop file) - always resolve ours 2016-11-25 05:07:25 +01:00
hwcomposer SVN_SILENT made messages (.desktop file) - always resolve ours 2016-11-25 05:07:25 +01:00
virtual SVN_SILENT made messages (.desktop file) - always resolve ours 2016-11-25 05:07:25 +01:00
wayland SVN_SILENT made messages (.desktop file) - always resolve ours 2016-11-25 05:07:25 +01:00
x11 SVN_SILENT made messages (.desktop file) - always resolve ours 2016-11-25 05:07:25 +01:00
CMakeLists.txt