summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md7
-rw-r--r--VERSION2
-rw-r--r--src/elixir.app.src2
3 files changed, 8 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2f58696a6..27f82773b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,15 @@
# Changelog
-## v1.0.2-dev
+## v1.0.2 (2014-10-21)
* Bug fixes
* [EEx] Remove invalid warning when attempting to inline code in EEx
+ * [EEx] Unify syntax errors to always include `file:line:`
* [IEx] Set null prompt function in dumb term mode
+ * [Kernel] Do not define an ets table with the same name as the module as it clashes with user code
+ * [Kernel] Fail compiling try expressions if they lack one of catch/after/rescue/else clauses
+ * [Kernel] Improve error messages when parsing fails on aliases
+ * [Kernel] Improve warnings coming from compile-time evaulation of arguments
* [String] Fix `String.replace/4` typespec
## v1.0.1 (2014-10-07)
diff --git a/VERSION b/VERSION
index a8d4b15c3..e6d5cb833 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.0.2-dev \ No newline at end of file
+1.0.2 \ No newline at end of file
diff --git a/src/elixir.app.src b/src/elixir.app.src
index cffbf0a9b..08c043901 100644
--- a/src/elixir.app.src
+++ b/src/elixir.app.src
@@ -1,6 +1,6 @@
{application, elixir,
[{description, "elixir"},
- {vsn, "1.0.2-dev"},
+ {vsn, "1.0.2"},
{modules, [
elixir
]},