l10n daemon script 9ba26510d0 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-10-24 06:05:03 +02:00
..
CMakeLists.txt	[autotests] Support new way to run the tests without need to install	2017-11-21 20:34:52 +01:00
opengl.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-10-24 06:05:03 +02:00
scene_opengl.cpp	[scenes/opengl] Fix overlaps in shadow texture atlas	2018-08-31 17:33:19 +03:00
scene_opengl.h	Enable blending if a subsurface has an alpha channel	2018-02-04 14:58:50 +01:00