[hamradio-commits] [dump1090] 193/389: Merge branch 'settings'

[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 a1d4a9f320a32ee7c0b5a0827766ffe9f4ad4507
Merge: d7df2ad 0dfc083
Author: terribl <terri at rannalla.net>
Date:   Tue May 21 21:46:58 2013 +0300

    Merge branch 'settings'

 public_html/gmap.html |  9 ++++--
 public_html/script.js | 39 ++++++++++++++++----------
 public_html/style.css | 77 ++++++++++++++++++++++++++++++++-------------------
 3 files changed, 79 insertions(+), 46 deletions(-)

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