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/src/common/target.h
+++ b/src/common/target.h
@@ -75,6 +75,7 @@ typedef enum {
    TGT_GEOS_APPLE,
    TGT_LUNIX,
    TGT_ATMOS,
+    TGT_TELESTRAT,
    TGT_NES,
    TGT_SUPERVISION,
    TGT_LYNX,