l10n daemon script df306a4062 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"		2017-02-28 12:58:59 +01:00
..
CMakeLists.txt
edge.cpp
edge.h
glxbackend.cpp
glxbackend.h
logging.cpp
logging.h
screens_xrandr.cpp
screens_xrandr.h
windowselector.cpp
windowselector.h
x11.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-02-28 12:58:59 +01:00
x11_platform.cpp
x11_platform.h
x11cursor.cpp
x11cursor.h
xinputintegration.cpp
xinputintegration.h