-
Till Theato authored
Conflicts: src/core.cpp src/jogaction.cpp src/monitor/monitor.cpp src/monitor/monitormanager.cpp src/monitor/recmonitor.cpp src/projectlist.cpp
e4cc635a
Conflicts: src/core.cpp src/jogaction.cpp src/monitor/monitor.cpp src/monitor/monitormanager.cpp src/monitor/recmonitor.cpp src/projectlist.cpp