-
Stuart Dickson authored
Conflicts: krita/gemini/MainWindow.cpp krita/gemini/desktopviewproxy.cpp krita/gemini/desktopviewproxy.h krita/gemini/main.cpp
3f162a3c
Conflicts: krita/gemini/MainWindow.cpp krita/gemini/desktopviewproxy.cpp krita/gemini/desktopviewproxy.h krita/gemini/main.cpp