l10n daemon script db12cb6742 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-06-21 05:35:42 +02:00
..
shaders
CMakeLists.txt
lanczosfilter.cpp
lanczosfilter.h
opengl.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-06-21 05:35:42 +02:00
resources.qrc
scene_opengl.cpp	[scenes/opengl] Ensure there is current OpenGL context when destroying EffectFrame unstyled texture	2019-04-23 23:59:27 +03:00
scene_opengl.h