Merge remote-tracking branch 'origin/master' into ASAP_POKEY
This commit is contained in:
commit
add1bf603b
6 changed files with 154 additions and 9 deletions
|
|
@ -948,6 +948,7 @@ struct FurnaceGUISysDef {
|
|||
const char* name;
|
||||
const char* extra;
|
||||
String definition;
|
||||
std::vector<FurnaceGUISysDefChip> orig;
|
||||
FurnaceGUISysDef(const char* n, std::initializer_list<FurnaceGUISysDefChip> def, const char* e=NULL);
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue