l10n daemon script c1e88d0af8 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-12-02 04:38:37 +01:00
..
CMakeLists.txt	Move linking to DL_LIBRARY to x11standalone platform	2016-11-22 14:22:06 +01:00
edge.cpp
edge.h
glxbackend.cpp	Move linking to DL_LIBRARY to x11standalone platform	2016-11-22 14:22:06 +01:00
glxbackend.h
logging.cpp
logging.h
screens_xrandr.cpp
screens_xrandr.h
windowselector.cpp	Support interactive window selection through the Platform	2016-11-17 08:08:56 +01:00
windowselector.h	Support interactive window selection through the Platform	2016-11-17 08:08:56 +01:00
x11.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-12-02 04:38:37 +01:00
x11_platform.cpp	Support interactive window selection through the Platform	2016-11-17 08:08:56 +01:00
x11_platform.h	Support interactive window selection through the Platform	2016-11-17 08:08:56 +01:00
x11cursor.cpp
x11cursor.h
xinputintegration.cpp
xinputintegration.h