Dominik Demuth 032ffb72b1 Merge branch 'main' into dsc ... # Conflicts: # src/gui_qt/main/mainwindow.py		2023-06-20 18:07:52 +02:00
..
gui_qt	Merge branch 'main' into dsc	2023-06-20 18:07:52 +02:00
nmreval	Merge branch 'main' into dsc	2023-06-20 18:07:52 +02:00
resources	Merge branch 'main' into dsc	2023-06-20 18:07:52 +02:00