Merge remote-tracking branch 'upstream/master' into creativision

2017-02-01 18:15:05 +01:00
parent 0dc85268c4 6878ede5d7
commit 07f840f11c
404 changed files with 8404 additions and 3086 deletions
--- a/src/common/target.h
+++ b/src/common/target.h
@@ -55,6 +55,7 @@ typedef enum {
    TGT_NONE,
    TGT_MODULE,
    TGT_ATARI,
+    TGT_ATARI2600,
    TGT_ATARI5200,
    TGT_ATARIXL,
    TGT_VIC20,
@@ -81,6 +82,7 @@ typedef enum {
    TGT_PCENGINE,
    TGT_GAMATE,
    TGT_SUPERVISION,
+    TGT_C65,
    TGT_COUNT                   /* Number of target systems */
 } target_t;