kwin/plugins/platforms/x11
l10n daemon script a3cd28a87e 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-14 09:57:09 +00:00
..
standalone SVN_SILENT made messages (.desktop file) - always resolve ours 2016-04-14 09:57:09 +00:00
windowed Move the x11 plugin sources into a x11/windowed directory 2016-04-12 08:04:16 +02:00
CMakeLists.txt Add a very basic x11/standalone platform plugin 2016-04-12 08:04:16 +02:00