From f26f4128fb43c5bc76d474dad02e55a5dc1e9a48 Mon Sep 17 00:00:00 2001
From: Olivier Guinart <olivier_guinart+github@live.com>
Date: Sun, 24 Sep 2017 12:22:32 -0700
Subject: [PATCH] Changed version from 0.0.1 to 1.0.0 and added *.vsix to
 .gitignore

---
 .gitignore   | 3 ++-
 CHANGELOG.md | 2 +-
 package.json | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6343560..e715592 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 out
 server
-node_modules
\ No newline at end of file
+node_modules
+*.vsix
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 551c9a4..0a41651 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 # Change Log
 All notable changes to the "merlin32" extension will be documented in this file.
 
-## [1.0] - 2017-09-24
+## [1.0.0] - 2017-09-24
 - Initial release
   - syntax coloring, auto-completion, tooltips on hover
 
diff --git a/package.json b/package.json
index bbfad5c..aa87069 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
     "name": "merlin32",
     "displayName": "Merlin32",
     "description": "Language support for Merlin32",
-    "version": "0.0.1",
+    "version": "1.0.0",
     "publisher": "Aito",
     "engines": {
         "vscode": "^1.15.0"