Merged kfsone/tradedangerous into master

eyeonus · Jan 30, 2015 · a6f72a9 · a6f72a9
2 parents 8656a22 + 0d9ad68
commit a6f72a9
Show file tree

Hide file tree

Showing 8 changed files with 1,256 additions and 832 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -6,6 +6,7 @@ v6.8.2 Jan 27 2015
 . (kfsone) Issue #148 Don't blow up horribly when tkinter is missing,
 . (kfsone) Issue #149 "nav" with --via was broken,
 . (kfsone) Typo correction in the maddavo splash (thanks, Stefan),
++ Stations: Tromador, Dave Ryalls, Jason Zions, MacNetron
 
 v6.8.1 Jan 25 2015
 . (kfsone) Additional rules to prevent data pollution (ocr derp protection),