Marcus Huderle d63bebee69 Merge remote-tracking branch 'origin/master' into fix827 ... # Conflicts: # src/mainwindow.cpp		2020-12-14 17:57:30 -06:00
..
core	Merge remote-tracking branch 'origin/master' into fix827	2020-12-14 17:57:30 -06:00
lib	add #pragma once to include files	2020-10-24 15:51:10 -04:00
ui	Merge remote-tracking branch 'origin/master' into script-editing	2020-12-13 00:30:22 -05:00
config.h	Merge remote-tracking branch 'origin/master' into fix827	2020-12-14 17:57:30 -06:00
editor.h	Merge remote-tracking branch 'origin/master' into fix827	2020-12-14 17:57:30 -06:00
log.h	add #pragma once to include files	2020-10-24 15:51:10 -04:00
mainwindow.h	Merge remote-tracking branch 'origin/master' into fix827	2020-12-14 17:57:30 -06:00
project.h	Merge remote-tracking branch 'origin/master' into fix827	2020-12-14 17:57:30 -06:00
scripting.h	add #pragma once to include files	2020-10-24 15:51:10 -04:00
settings.h	add #pragma once to include files	2020-10-24 15:51:10 -04:00