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

This commit is contained in:
Christian Groessler
2017-02-13 21:38:38 +01:00
23 changed files with 1655 additions and 546 deletions

View File

@@ -32,7 +32,8 @@ TARGETS = apple2 \
pce \
sim6502 \
sim65c02 \
supervision
supervision\
telestrat
DRVTYPES = emd \
joy \