[hamradio-commits] [dump1090] 382/389: Merge branch 'master' into faurl

[Matthew Ernisse]

This is an automated email from the git hooks/post-receive script.

mernisse-guest pushed a commit to branch master
in repository dump1090.

commit cd09210cb94eeff049c554d1407e5c8c3518eb01
Merge: 87a88c9 6d55cf6
Author: Jeff Lawson <jeff at bovine.net>
Date:   Wed Oct 29 23:00:38 2014 -0500

    Merge branch 'master' into faurl

 coaa1090.obj                                       | Bin 33004 -> 36956 bytes
 ...09.0608.14.zip => dump1090-win.1.10.2910.14.zip | Bin 614488 -> 616278 bytes
 dump1090.c                                         |   4 +
 dump1090.dsp                                       |   4 +
 dump1090.h                                         |   4 +-
 dump1090.rc                                        | 115 +++++++++++++++++++++
 net_io.c                                           | 101 ++++++++++++------
 public_html/config.js                              |   1 +
 public_html/gmap.html                              |   4 +-
 public_html/planeObject.js                         |   6 ++
 public_html/script.js                              |  37 ++++++-
 public_html/style.css                              |   2 +-
 winstubs.h                                         |   1 +
 13 files changed, 238 insertions(+), 41 deletions(-)

diff --cc public_html/script.js
index 4a77db3,150179c..8212e50
--- a/public_html/script.js
+++ b/public_html/script.js
@@@ -267,9 -267,9 +267,10 @@@ function refreshSelected() 
  	} else if (selected && selected.squawk == 7700) { // General Emergency
  		html += ' <span class="squawk7700"> Squawking: General Emergency </span>';
  	} else if (selected && selected.flight != '') {
+ 		html += ' <a href="http://fr24.com/'+selected.flight+'" target="_blank">[FR24]</a>';
  	    html += ' <a href="http://www.flightstats.com/go/FlightStatus/flightStatusByFlight.do?';
          html += 'flightNumber='+selected.flight+'" target="_blank">[FlightStats]</a>';
 +	    html += ' <a href="http://flightaware.com/live/flight/'+selected.flight+'" target="_blank">[FlightAware]</a>';
  	}
  	html += '<td></tr>';
  	

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/dump1090.git