From e82e905b11346eac372fdbe13554abc05c96b8c6 Mon Sep 17 00:00:00 2001
From: EBatTiVo <ebishton@tivo.com>
Date: Mon, 13 Jul 2015 23:00:20 -0700
Subject: [PATCH] Prep for 0.9.5 release. Update release notes and
 contributors.

---
 CHANGELOG.md            | 12 +++++++++++-
 CONTRIBUTORS.md         |  4 ++++
 src/META-INF/plugin.xml |  4 ++--
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0eaeb4d70..1c3cd3d47 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,17 @@
      Warning: This plugin will NOT work correctly using IDEA version 14.1.2. It works well with
      versions 14.1 and 14.1.1. Version 14.1.3 is still being tested.
   </p>
-
+  <p>0.9.5: (community release)</p>
+  <ul>
+    <li>Add new typing support for type checking and completion. (Thanks to Carlos Ballesteros!) (Issues #288,#291,#308,#317)</li>
+    <li>Support static extensions in completion. (Again, Thanks, Carlos!)<li>
+    <li>Fix debugger getting stuck "collecting data" for some variables (particularly, "this"). (Issue #325)</li>
+    <li>Better compiler error highlighting. (Issue #180 redux.)</li>
+    <li>Fix Cut/Copy/Paste buffer inconsistencies (Issue #196)</li>
+    <li>Add generics support. (First level only, chained sequences remain incomplete.)</li>
+    <li>Allow object literals as return statements. (Issue #278)</li>
+    <li>Fix NPE during annotation, causing annotation to stop. (Issue #316)</li>
+  </ul>
   <p>0.9.4: (community release)</p>
   <ul>
     <li>Fix compile error highlighting in the output pane and jumping to source location when an error is clicked upon (Issues #129, #160, #180).</li>
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index d4f6ed792..2de6bafe1 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -4,10 +4,12 @@ Recent contributors
  - AS3Boyan <denis.flash.as3@gmail.com>
  - bjitivo <bji@tivo.com>
  - Bryan Ischo <bryan@ischo.com>
+ - Carlos Ballesteros Velasco <soywiz@gmail.com>
  - EBatTiVo <ebishton@tivo.com>
  - eliasku <deadbabe@gmail.com>
  - Elias Ku <deadbabe@gmail.com>
  - Eric B <ebishton@tivo.com>
+ - Gabor Csomak <csomakk@gmail.com>
  - giabao <giabao@sandinh.net>
  - Hays Clark <hays@infinitedescent.com>
  - Jérémy Faivre <jeremy.faivre@gmail.com>
@@ -28,6 +30,7 @@ All contributors
 - bjitivo <bji@tivo.com>
 - Bruno Garcia <b@aduros.com>
 - Bryan Ischo <bryan@ischo.com>
+- Carlos Ballesteros Velasco <soywiz@gmail.com>
 - Chris Decoster <impaler777@gmail.com>
 - Constantine Plotnikov <constantine.plotnikov@gmail.com>
 - Denis.Zhdanov <denzhdanov@gmail.com>
@@ -45,6 +48,7 @@ All contributors
 - Fedor Korotkov <fedor.korotkov@jetbrains.com>
 - Fedor Korotkov <fedor.korotkov@odnoklassniki.ru>
 - fkorotkov <fkorotkov@twitter.com>
+- Gabor Csomak <csomakk@gmail.com>
 - giabao <giabao@sandinh.net>
 - Gregory.Shrago <gregory.shrago@jetbrains.com>
 - Hays Clark <hays@infinitedescent.com>
diff --git a/src/META-INF/plugin.xml b/src/META-INF/plugin.xml
index 8ea8b85d0..b4ec63a45 100644
--- a/src/META-INF/plugin.xml
+++ b/src/META-INF/plugin.xml
@@ -29,13 +29,13 @@
   <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.5.TiVo.preview for @plugin.compatibility.description@</version>
+  <version>0.9.5 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.5.TiVo.preview: (community release)</p>
+      <p>0.9.5: (community release)</p>
       <ul>
         <li>Add new typing support for type checking and completion. (Thanks to Carlos Ballesteros!) (Issues #288,#291,#308,#317)</li>
         <li>Support static extensions in completion. (Again, Thanks, Carlos!)<li>