mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-10-01 15:24:13 +02:00
48aac69391
Only one conflict: the include block of sources/ui/configpage/generalconfigurationpage.cpp, where upstream adds editor/terminalnamecheck.h next to the two includes of the prefix editor. All three are kept. The file list in cmake/qet_compilation_vars.cmake merged itself this time.