l10n daemon script c8122e4cd5 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"		2023-11-29 02:08:23 +00:00
..
killer	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-11-29 02:08:23 +00:00
wayland_wrapper	port most uses of the reset(new ...) pattern to std::make_unique	2023-08-11 15:58:15 +02:00
CMakeLists.txt