l10n daemon script 4e0aa9c78b 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-11-11 10:36:42 +01:00
..
pipewire	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-11-11 10:36:42 +01:00
qt	Declare and use logging categories	2020-08-13 20:17:39 +02:00
xcb	Use C++11 loops	2020-10-23 10:55:37 +02:00
CMakeLists.txt	Implement Wayland support using PipeWire and xdg-desktop-portal	2019-05-24 13:51:43 +02:00