mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-10-01 23:54:13 +02:00
03bffa96c7
Conflicts in cmake/qet_compilation_vars.cmake only, where upstream added terminaluuids.cpp/.h next to the qetlabelsfile.cpp/.h this branch adds : both are kept, qetlabelsfile first to stay alphabetical.