Merge branch 'master' of https://github.com/nmatsuda/spidr

Conflicts:
	dump1090/dump1090
	dump1090/interactive.c
	dump1090/interactive.o
	dump1090/view1090

Former-commit-id: 116392c4acfba308a1acb36f51b8d2f869e275d1

dump1090/dump1090.REMOVED.git-id

@@ -1 +0,0 @@
-6e78e92e9261a1c1a12064288f64a1786a246ec6

dump1090/interactive.c

@@ -572,6 +572,7 @@ void interactiveShowData(void) {
                         printf("\n ");
                     }
 
+<<<<<<< HEAD
                     if ((now - a->seen) > 30 ) {
                         printf("\x1B[1;30m%-8s%5s %4s %5s  %c%c %d",
                             a->flight, 
@@ -589,6 +590,16 @@ void interactiveShowData(void) {
                             cLat, cLon,
                             (int)((float)signalAverage/25.0f));
                     }
+=======
+                    printf("\x1B[1;31m%-8s\x1B[1;32m%5s \x1B[1;33m%4s \x1B[1;34m%5s  \x1B[1;36m%c%c \x1B[1;35m%d",
+                        a->flight, 
+                        strFl, 
+                        strGs,
+                        strD, 
+                        cLat, cLon,
+                        (int)((float)signalAverage/25.0f));
+
+>>>>>>> 474b6b928fbf41ebad522ee55fae952c481aabf5
 
                     if(d<5) {
                      printf("%ls",L"\x1B[1;37m│\n└──────────────────────────────┘");