l10n daemon script 87ad1774a2 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"		2019-07-22 05:10:18 +02:00
..
pipewire	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-07-22 05:10:18 +02:00
qt	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-07-22 05:10:18 +02:00
xcb	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-05-26 05:18:37 +02:00
CMakeLists.txt	Implement Wayland support using PipeWire and xdg-desktop-portal	2019-05-24 13:51:43 +02:00