From 25c94a1422efc41d5560db11b136f9d8f957ad41 Mon Sep 17 00:00:00 2001
From: "Kern Handa (KERN)" <kerha@microsoft.com>
Date: Fri, 14 Jun 2019 14:37:07 +0000
Subject: [PATCH] Merged PR 1310: ELL release v3.0.0

---
 History.md | 6 +++++-
 VERSION    | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/History.md b/History.md
index f01210553..9dab12a4d 100644
--- a/History.md
+++ b/History.md
@@ -1,7 +1,11 @@
-## 3.0.0 *
+## 3.0.0
 - Improve Python API so Map and CompiledMap have a way of calling compute on models with multiple inputs and outputs (see ComputeList)
 - Improve Python Callback handling so Python apps can handle models with any number of and type of callbacks.
 - Simplify datasetFromImages.py so it can create training, testing and validation set from one set of images on disk.
+- Update repurposing tutorial setup to take advantage of dataFromImages.py changes
+- Update index.md to fix bug in Linux instructions
+- Fix FFTNode so that behavior is identical to NumPy behavior
+- Update make_featurizer.py to calculate features correctly
 
 ## 2.5.4
 - Add support for ONNX GlobalAveragePooling
diff --git a/VERSION b/VERSION
index fe16b348d..4a36342fc 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.5.4
+3.0.0