l10n daemon script 44f6b70245 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-12-07 05:38:05 +01:00
..
shaders
CMakeLists.txt
lanczosfilter.cpp
lanczosfilter.h
opengl.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-12-07 05:38:05 +01:00
resources.qrc
scene_opengl.cpp	Revert the fix for the texture bleeding issue	2019-12-02 19:45:15 +02:00
scene_opengl.h