l10n daemon script 75f3964db7 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"		2015-10-25 10:45:05 +00:00
..
CMakeLists.txt
egl_wayland_backend.cpp
egl_wayland_backend.h
logging.cpp
logging.h
scene_qpainter_wayland_backend.cpp
scene_qpainter_wayland_backend.h
screens_wayland.cpp
screens_wayland.h
wayland.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-10-25 10:45:05 +00:00
wayland_backend.cpp
wayland_backend.h