Marcus Huderle 54be7a18a9 Merge remote-tracking branch 'tustin/path-in-config' ... # Conflicts: # docsrc/manual/settings-and-options.rst # include/config.h # src/config.cpp # src/scriptapi/apimap.cpp # src/scriptapi/scripting.cpp		2022-09-25 10:02:24 -05:00
..
core	Merge pull request #448 from GriffinRichards/handle-collision	2022-09-03 12:49:07 -05:00
lib	Read object event gfx info by parsing its C file, rather than relying on regex	2022-07-03 11:28:24 -05:00
ui	Merge remote-tracking branch 'griffin/api-redesign'	2022-09-24 15:48:42 -05:00
config.h	Merge remote-tracking branch 'tustin/path-in-config'	2022-09-25 10:02:24 -05:00
editor.h	Merge pull request #455 from GriffinRichards/api-border	2022-09-03 12:48:35 -05:00
log.h	add #pragma once to include files	2020-10-24 15:51:10 -04:00
mainwindow.h	Merge branch 'master' into api-redesign	2022-09-12 13:01:22 -04:00
project.h	Read object event gfx info by parsing its C file, rather than relying on regex	2022-07-03 11:28:24 -05:00
scripting.h	Standardize API file names	2022-09-05 12:17:27 -04:00
scriptutility.h	Standardize API file names	2022-09-05 12:17:27 -04:00
settings.h	add #pragma once to include files	2020-10-24 15:51:10 -04:00