kwin/plugins/platforms/x11
l10n daemon script 1309b8c8a0 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-04-16 09:59:16 +00:00
..
common Move the EglOnXBackend to the x11 platforms 2016-04-15 09:15:20 +02:00
standalone SVN_SILENT made messages (.desktop file) - always resolve ours 2016-04-16 09:59:16 +00:00
windowed Move the EglOnXBackend to the x11 platforms 2016-04-15 09:15:20 +02:00
CMakeLists.txt Move the EglOnXBackend to the x11 platforms 2016-04-15 09:15:20 +02:00