l10n daemon script 83cc5f5842 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-05 10:23:58 +00:00
..
CMakeLists.txt
logging.cpp
logging.h
scene_qpainter_x11_backend.cpp
scene_qpainter_x11_backend.h
screens_x11windowed.cpp
screens_x11windowed.h
x11.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-10-05 10:23:58 +00:00
x11windowed_backend.cpp	[backends/x11] Allow grab keyboard/pointer	2015-09-30 07:40:45 +02:00
x11windowed_backend.h	[backends/x11] Allow grab keyboard/pointer	2015-09-30 07:40:45 +02:00