l10n daemon script 93034e04cf 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-20 09:37:30 +00:00
..
CMakeLists.txt	Create screen edge through the Platform	2016-04-19 13:29:55 +02:00
edge.cpp	Create screen edge through the Platform	2016-04-19 13:29:55 +02:00
edge.h	Create screen edge through the Platform	2016-04-19 13:29:55 +02:00
glxbackend.cpp
glxbackend.h
logging.cpp
logging.h
screens_xrandr.cpp
screens_xrandr.h
x11.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-04-20 09:37:30 +00:00
x11_platform.cpp	Create screen edge through the Platform	2016-04-19 13:29:55 +02:00
x11_platform.h	Create screen edge through the Platform	2016-04-19 13:29:55 +02:00