terribl f53632b00d Merge branch 'mapRefactor' into masterMerge ... Conflicts: .gitignore public_html/gmap.html public_html/script.js All conflicts fixed but you are still merging. modified: .gitignore modified: dump1090.c new file: public_html/config.js new file: public_html/coolclock/coolclock.js new file: public_html/coolclock/excanvas.js new file: public_html/coolclock/moreskins.js new file: public_html/extension.js modified: public_html/gmap.html new file: public_html/options.js new file: public_html/planeObject.js modified: public_html/script.js modified: public_html/style.css		2013-06-03 10:53:17 +03:00
..
coolclock	Couple more small tweaks to the tails of planes.	2013-05-22 17:09:12 +00:00
config.js	Tyop corrected	2013-05-30 12:31:41 +03:00
extension.js	Split into multiple JS files,	2013-05-24 02:15:37 +00:00
gmap.html	Added warning label when 7x00 squawk is shown.	2013-06-02 16:51:38 +03:00
options.js	Rolling back a couple changes and spawning a branch from here.	2013-05-30 21:26:16 +00:00
planeObject.js	From DE8MSH: Plane markers!	2013-06-02 20:49:45 +03:00
script.js	Merge branch 'mapRefactor' into masterMerge	2013-06-03 10:53:17 +03:00
style.css	Added warning label when 7x00 squawk is shown.	2013-06-02 16:51:38 +03:00