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

2017-02-13 21:38:38 +01:00
parent 38451fa8a4 287c5d6cd3
commit a5fba551d1
23 changed files with 1655 additions and 546 deletions
--- a/README.md
+++ b/README.md
@@ -31,6 +31,7 @@ including
 - the Watara Supervision console.
 - the VTech Creativision console.
 - the Oric Atmos.
+- the Oric Telestrat.
 - the Lynx console.
 - the Ohio Scientific Challenger 1P.