[hamradio-commits] [dump1090] 248/389: Merge pull request #8 from bdavenport/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 da8151dd704fca84b82a538ff05d9f5ac6f79805
Merge: 228b770 82b61f2
Author: MalcolmRobb <Support at ATTAvionics.com>
Date:   Fri Jun 21 15:34:12 2013 -0700

    Merge pull request #8 from bdavenport/master
    
    I can't pretend that I understand what you guys are up to with all this Java stuff, but since the changes to the maon dump1090.c file are minimal I'll trust you :-)

 .gitignore                         |   1 +
 dump1090.c                         |   9 +-
 public_html/config.js              |  33 ++
 public_html/coolclock/coolclock.js | 318 ++++++++++++++
 public_html/coolclock/excanvas.js  | 785 +++++++++++++++++++++++++++++++++
 public_html/coolclock/moreskins.js | 212 +++++++++
 public_html/extension.js           |  19 +
 public_html/gmap.html              |  85 +++-
 public_html/options.js             |  17 +
 public_html/planeObject.js         | 257 +++++++++++
 public_html/script.js              | 875 ++++++++++++++++++++++---------------
 public_html/style.css              |  81 ++--
 12 files changed, 2263 insertions(+), 429 deletions(-)

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