kwin/src/plugins/platforms/x11
l10n daemon script 76d1de48a8 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"
2021-08-22 01:17:35 +00:00
..
common Revert "Fix compile issue in https://bugs.kde.org/show_bug.cgi?id=440372" 2021-08-03 18:09:04 +02:00
standalone SVN_SILENT made messages (.desktop file) - always resolve ours 2021-08-22 01:17:35 +00:00
windowed SVN_SILENT made messages (.desktop file) - always resolve ours 2021-08-01 01:21:11 +00:00
CMakeLists.txt Move source code to src/ directory 2021-02-10 15:31:43 +00:00