From e059979b07568e3856a448d7fe44e0f62286f982 Mon Sep 17 00:00:00 2001
From: EBatTiVo <ebishton@tivo.com>
Date: Mon, 18 Jan 2016 19:13:02 -0800
Subject: [PATCH 1/3] Update release notes.

---
 CHANGELOG.md            | 6 ++++++
 CONTRIBUTORS.md         | 4 ++--
 common.xml              | 2 ++
 idea_v14.properties     | 2 +-
 src/META-INF/plugin.xml | 8 +++++++-
 5 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e3172750a..c314d4d56 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,12 @@
      Warning: This plugin will NOT work correctly using IDEA version 14.1.2. It works well with
      versions 14.1 and 14.1.1, 14.1.3, and 14.1.4.
   </p>
+  <p>0.9.8: (community release)</p>
+  <ul>
+    <li>Version 14.1.5 and 14.1.6 compatibility.</li>
+    <li>Fix up some expressions to ignore non-error messages.</li>
+    <li>Fix comment alignment for single-line comments.(Issue #295)</li>
+  </ul>
   <p>0.9.7: (community release)</p>
   <ul>
     <li>Fix the watch pane when debugging: typing and completion now work.</li>
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 424ed7e94..be2b84a91 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1,13 +1,12 @@
 Recent contributors
 -----------------------------------
  - as3boyan <denis.flash.as3@gmail.com>
- - AS3Boyan <denis.flash.as3@gmail.com>
- - bjitivo <bji@tivo.com>
  - Carlos Ballesteros Velasco <soywiz@gmail.com>
  - EBatTiVo <ebishton@tivo.com>
  - Eric B <ebishton@tivo.com>
  - Gabor Csomak <csomakk@gmail.com>
  - giabao <giabao@sandinh.net>
+ - isBatak <ivicabatinic123@gmail.com>
  - Jérémy Faivre <jeremy.faivre@gmail.com>
  - jeremyfa <jeremy.faivre@gmail.com>
  - sganapavarapu1 <ganapavarapu@tivo.com>
@@ -49,6 +48,7 @@ All contributors
 - Gregory.Shrago <gregory.shrago@jetbrains.com>
 - Hays Clark <hays@infinitedescent.com>
 - impaler <user123@server.fake>
+- isBatak <ivicabatinic123@gmail.com>
 - Jérémy Faivre <jeremy.faivre@gmail.com>
 - jeremyfa <jeremy.faivre@gmail.com>
 - kirill.safonov <kirill.safonov@jetbrains.com>
diff --git a/common.xml b/common.xml
index 38ad0c155..ccb7ab390 100644
--- a/common.xml
+++ b/common.xml
@@ -235,6 +235,8 @@
     <echo>Using IDEA build at "${idea.ultimate.build}"</echo>
     <echo>Idea property file is ${plugin.properties.file}</echo>
     <echo>Including version specific code from ${version.specific.code.location}</echo>
+    <echo>The minimum IDEA version required to install will be ${plugin.installable.since}</echo>
+    <echo>The maximum IDEA version allowed to install will be ${plugin.installable.until}</echo>
   </target>
 
 
diff --git a/idea_v14.properties b/idea_v14.properties
index 4ec0e6cb9..55530a1f9 100644
--- a/idea_v14.properties
+++ b/idea_v14.properties
@@ -7,7 +7,7 @@
 idea.version=14.0
 
 # Human-readable versions of IDEA that this build is compatible with.
-plugin.compatibility.description=IDEA 14
+plugin.compatibility.description=IDEA 14.0
 
 
 # ###################################################
diff --git a/src/META-INF/plugin.xml b/src/META-INF/plugin.xml
index e3e6d4762..2935a11df 100644
--- a/src/META-INF/plugin.xml
+++ b/src/META-INF/plugin.xml
@@ -29,12 +29,18 @@
   <depends optional="true" config-file="flex-debugger-support.xml">com.intellij.flex</depends>
   <depends optional="true" config-file="debugger-support.xml">com.intellij.modules.ultimate</depends>
 
-  <version>0.9.7 for @plugin.compatibility.description@</version>
+  <version>0.9.8 for @plugin.compatibility.description@</version>
   <change-notes>
     <![CDATA[
       <p>This build is compatible with @plugin.compatibility.description@</p>
       <p>It was built using IDEA build @idea.sdk.version@</p>
       <p/>
+      <p>0.9.8: (community release)</p>
+      <ul>
+        <li>Version 14.1.5 and 14.1.6 compatibility.</li>
+        <li>Fix up some expressions to ignore non-error messages.</li>
+        <li>Fix comment alignment for single-line comments.(Issue #295)</li>
+      </ul>
       <p>0.9.7: (community release)</p>
       <ul>
         <li>Fix the watch pane when debugging: typing and completion now work.</li>

From 925e3c222f2bac309a473229e500c17e2a66f35b Mon Sep 17 00:00:00 2001
From: EBatTiVo <ebishton@tivo.com>
Date: Mon, 18 Jan 2016 19:18:16 -0800
Subject: [PATCH 2/3] Change target IDEA for CI from 14.1.4 to 14.1.6.

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 05c353ca8..39dd924a6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,6 @@ script: make test
 env:
     - IDEA_VERSION=13.1.6
     - IDEA_VERSION=14.0.4
-    - IDEA_VERSION=14.1.4
+    - IDEA_VERSION=14.1.6
 notifications:
   email: false
\ No newline at end of file

From 28f3f9b99debb4b96c14d198d2e8688ba82eb652 Mon Sep 17 00:00:00 2001
From: EBatTiVo <ebishton@tivo.com>
Date: Tue, 19 Jan 2016 09:44:23 -0800
Subject: [PATCH 3/3] Updated version warning in the CHANGELOG.

---
 CHANGELOG.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c314d4d56..71a4ce504 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,8 @@
 #Changelog
   <p>
-     Warning: This plugin will NOT work correctly using IDEA version 14.1.2. It works well with
-     versions 14.1 and 14.1.1, 14.1.3, and 14.1.4.
+     Warning: The 14.1 version of this plugin will NOT work correctly using IDEA version 14.1.2.
+     It works well with versions 14.1, 14.1.1, 14.1.3, and 14.1.4.  The version 14.1.5 version
+     of the plugin is for IDEA versions 14.1.5 and 14.1.6.
   </p>
   <p>0.9.8: (community release)</p>
   <ul>