[hamradio-commits] [dump1090] 354/373: Merge remote-tracking branch 'upstream/master' into HEAD

[Matthew Ernisse]

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

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

commit 2f96fbb0239d3b99901d998f7c88172d70f6d475
Merge: fa6f9c3 65751ed
Author: Matthew Ernisse <mernisse at ub3rgeek.net>
Date:   Fri Oct 17 13:45:24 2014 -0400

    Merge remote-tracking branch 'upstream/master' into HEAD
    
    merge upstream dump1090.

 dump1090.c            | 141 +++++++++++++++++++++++++++++++++++++-------------
 dump1090.h            |   5 +-
 interactive.c         |  31 +++++------
 mode_s.c              |  25 ++++++---
 net_io.c              |  46 +++++++++-------
 public_html/gmap.html |   2 +-
 public_html/script.js |   8 ++-
 public_html/style.css |   5 +-
 8 files changed, 180 insertions(+), 83 deletions(-)

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