From 88e502dda1e0e1493abd4bd69c870710a57d323c Mon Sep 17 00:00:00 2001
From: Anders Wenhaug <wenhaug@stud.ntnu.no>
Date: Wed, 16 Sep 2015 18:37:04 +0200
Subject: [PATCH] Bump version to 2.0

---
 CHANGELOG.md | 2 +-
 version.txt  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 26b6ce1f..490caeb0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 ## Changelog
 
-#### Version 1.4
+#### Version 2.0
 - Automatic knot vector selection using moving average
 - Added PolynomialRegression (including MatLab interface)
 - Added saving and loading of PSpline, RadialBasisFunction and PolynomialRegression
diff --git a/version.txt b/version.txt
index 336d8daa..5db3583d 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1-4
+2-0