Skip to content
Commit e4cc635a authored by Till Theato's avatar Till Theato Committed by Vincent PINON
Browse files

Update includes. 

Conflicts:
	src/core.cpp
	src/jogaction.cpp
	src/monitor/monitor.cpp
	src/monitor/monitormanager.cpp
	src/monitor/recmonitor.cpp
	src/projectlist.cpp
parent 64bfe657
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment