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

2015-07-11 13:05:26 +02:00
parent 1365afa845 50b0536222
commit 877fd532c2
112 changed files with 3314 additions and 940 deletions
--- a/src/common/target.h
+++ b/src/common/target.h
@@ -64,6 +64,7 @@ typedef enum {
    TGT_PLUS4,
    TGT_CBM510,
    TGT_CBM610,
+    TGT_OSIC1P,
    TGT_PET,
    TGT_BBC,
    TGT_APPLE2,