l10n daemon script f162574aba 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"		2020-01-19 09:14:45 +01:00
..
pipewire	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-01-19 09:14:45 +01:00
qt	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-07-31 05:17:18 +02:00
xcb	Correctly populate max color values in server screen format	2020-01-05 19:14:24 +01:00
CMakeLists.txt	Implement Wayland support using PipeWire and xdg-desktop-portal	2019-05-24 13:51:43 +02:00