synced with kfsone/master

eyeonus · Jun 11, 2016 · 83f1588 · 83f1588
2 parents 20de379 + 03416f0
commit 83f1588
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -9,6 +9,13 @@ Jun 10 2016 (bgol, horizon branch):
 . New items for 1.6/2.1 update
 . Update EDAPI plugin to version 3.6.2
 
+v7.4.0 Jan 27 2016
+. Merged Tyler Lund's support for posting data to EDDN from edapi.
+. (kfsone) Merged Maddavo data.
+
+v7.3.3 Jan 22 2016
+. (kfsone) Maddavo Horizons import.
+
 Jan 16 2016 (bgol, horizon branch):
 . Fixed typo in EDAPI plugin
 . Horizon ship updates (thanks dave, fixes #4)

diff --git a/README.md b/README.md
@@ -773,11 +773,13 @@ Frontier provides an API for their mobile app. This can be used to report accura
       available. You will be prompted to enter any missing station information. 
 
     trade.py imp -P edapi -O eddn
-      This will do the same thing, but also post your market into to EDDN.
+      This will do the same thing, but also post your market, shipyard, and
+      outfitting modules to EDDN.
 
 ###Options (-O):
 
-    eddn:  Post market prices to EDDN.
+    eddn:  Post market, shipyard and outfitting to EDDN.
+    csvs:  Merge shipyards into ShipVendor.csv.
 
 
 ##MARKET sub-command: