l10n daemon script cf2791803f 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"		2019-10-31 05:34:18 +01:00
..
shaders
CMakeLists.txt
lanczosfilter.cpp
lanczosfilter.h
opengl.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-10-31 05:34:18 +01:00
resources.qrc
scene_opengl.cpp	[scenes/opengl] Set correct blend mode for EffectQuickView buffers	2019-10-02 20:51:47 +01:00
scene_opengl.h