l10n daemon script a3cd28a87e 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"		2016-04-14 09:57:09 +00:00
..
CMakeLists.txt	[plugins/platforms] Dedicated logging category for X11 standalone platform	2016-04-12 14:48:54 +02:00
logging.cpp	[plugins/platforms] Dedicated logging category for X11 standalone platform	2016-04-12 14:48:54 +02:00
logging.h	[plugins/platforms] Dedicated logging category for X11 standalone platform	2016-04-12 14:48:54 +02:00
screens_xrandr.cpp
screens_xrandr.h
x11.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-04-14 09:57:09 +00:00
x11_platform.cpp
x11_platform.h