866dfb4e89
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" |
||
---|---|---|
.. | ||
shaders | ||
CMakeLists.txt | ||
lanczosfilter.cpp | ||
lanczosfilter.h | ||
opengl.json | ||
resources.qrc | ||
scene_opengl.cpp | ||
scene_opengl.h |