-
Frederik Gladhorn authored
Conflicts: generators/dvi/generator_dvi.cpp generators/ooo/generator_ooo.cpp part.cpp shell/main.cpp shell/shell.cpp shell/shell.h shell/shellutils.h tests/CMakeLists.txt ui/propertiesdialog.cpp
b79e706e
Conflicts: generators/dvi/generator_dvi.cpp generators/ooo/generator_ooo.cpp part.cpp shell/main.cpp shell/shell.cpp shell/shell.h shell/shellutils.h tests/CMakeLists.txt ui/propertiesdialog.cpp