-
Dmitry Kazakov authored
# Conflicts: # 3rdparty/ext_ocio/CMakeLists.txt # krita/main.cc # libs/ui/kis_config.cc # libs/ui/kis_config.h # libs/ui/opengl/kis_opengl.cpp # libs/ui/opengl/kis_opengl_shader_loader.cpp
51d0dbf2
# Conflicts: # 3rdparty/ext_ocio/CMakeLists.txt # krita/main.cc # libs/ui/kis_config.cc # libs/ui/kis_config.h # libs/ui/opengl/kis_opengl.cpp # libs/ui/opengl/kis_opengl_shader_loader.cpp