Merge branch 'master' into master

This commit is contained in:
Miran Grča
2020-08-27 19:39:09 +02:00
committed by GitHub
4 changed files with 530 additions and 545 deletions

View File

@@ -446,9 +446,7 @@ extern int machine_at_s370sba_init(const machine_t *);
extern int machine_at_apas3_init(const machine_t *);
/* m_at_misc.c */
#if defined(DEV_BRANCH) && defined(USE_VIRTUALPC)
extern int machine_at_vpc2007_init(const machine_t *);
#endif
/* m_at_t3100e.c */
extern int machine_at_t3100e_init(const machine_t *);