[hamradio-commits] [dump1090] 246/389: Merge mapRefactor -> 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 b161004d8b33398abbeaaa37d4465814946ff029
Merge: 29d413e 5f0e295
Author: terribl <terri at rannalla.net>
Date:   Mon Jun 3 11:22:02 2013 +0300

    Merge mapRefactor -> master

 .gitignore                         |   2 +
 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              |  90 ++--
 public_html/options.js             |  17 +
 public_html/planeObject.js         | 257 +++++++++++
 public_html/script.js              | 889 ++++++++++++++++++++++---------------
 public_html/style.css              |  83 +---
 12 files changed, 2253 insertions(+), 461 deletions(-)

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