[hamradio-commits] [dump1090] 175/389: Merge pull request #3 from terribl/master

[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 7cff495346ddc34a3bd6b992962d3c0b033f03a7
Merge: df4a24b 7b99ad5
Author: MalcolmRobb <Support at ATTAvionics.com>
Date:   Tue May 14 14:20:06 2013 -0700

    Merge pull request #3 from terribl/master
    
    Web client

 .gitignore            |   5 +-
 dump1090.c            |  16 ++-
 public_html/gmap.html |   3 +-
 public_html/script.js | 327 ++++++++++++++++++++++++++++++++++----------------
 public_html/style.css |  13 +-
 5 files changed, 253 insertions(+), 111 deletions(-)

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