yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
kwin/plugins/platforms
History
l10n daemon script 819c645863 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-04-13 05:26:57 +02:00
..
drm SVN_SILENT made messages (.desktop file) - always resolve ours 2017-04-13 05:26:57 +02:00
fbdev SVN_SILENT made messages (.desktop file) - always resolve ours 2017-04-13 05:26:57 +02:00
hwcomposer SVN_SILENT made messages (.desktop file) - always resolve ours 2017-04-13 05:26:57 +02:00
virtual SVN_SILENT made messages (.desktop file) - always resolve ours 2017-04-13 05:26:57 +02:00
wayland SVN_SILENT made messages (.desktop file) - always resolve ours 2017-04-13 05:26:57 +02:00
x11 SVN_SILENT made messages (.desktop file) - always resolve ours 2017-04-13 05:26:57 +02:00
CMakeLists.txt