yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
kwin/backends
History
l10n daemon script e65f7a349f 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-01-18 14:17:07 +00:00
..
drm Merge branch 'Plasma/5.5' 2016-01-11 13:22:26 +01:00
fbdev SVN_SILENT made messages (.desktop file) 2016-01-10 14:47:34 +00:00
hwcomposer SVN_SILENT made messages (.desktop file) 2016-01-10 14:47:34 +00:00
virtual SVN_SILENT made messages (.desktop file) - always resolve ours 2016-01-12 12:09:37 +00:00
wayland SVN_SILENT made messages (.desktop file) 2016-01-10 14:47:34 +00:00
x11 SVN_SILENT made messages (.desktop file) - always resolve ours 2016-01-18 14:17:07 +00:00
CMakeLists.txt