l10n daemon script 36e3632101 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"		2018-01-28 06:53:21 +01:00
..
CMakeLists.txt	[autotests] Support new way to run the tests without need to install	2017-11-21 20:34:52 +01:00
scene_xrender.cpp	Render GL Window decorations at the correct scale	2017-11-01 17:59:11 +00:00
scene_xrender.h
xrender.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-01-28 06:53:21 +01:00