From 545d9e85e934f2fb096d35c35c5be79aefbac39a Mon Sep 17 00:00:00 2001
From: Calvin Rose <calsrose@gmail.com>
Date: Wed, 20 Oct 2021 19:57:02 -0500
Subject: [PATCH] Update CHANGELOG.md

---
 CHANGELOG.md         | 3 +++
 meson.build          | 2 +-
 src/conf/janetconf.h | 6 +++---
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cbd00da5..b6891e27 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,9 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## ??? - Unreleased
+- Deadlocked channels will no longer exit early - instead they will hang, which is more intuitive.
+
 ## 1.18.1 - 2021-10-16
 - Fix some documentation typos
 - Fix - Set pipes passed to subprocess to blocking mode.
diff --git a/meson.build b/meson.build
index 3e65a546..e36caaf8 100644
--- a/meson.build
+++ b/meson.build
@@ -20,7 +20,7 @@
 
 project('janet', 'c',
   default_options : ['c_std=c99', 'build.c_std=c99', 'b_lundef=false', 'default_library=both'],
-  version : '1.18.1')
+  version : '1.18.2')
 
 # Global settings
 janet_path = join_paths(get_option('prefix'), get_option('libdir'), 'janet')
diff --git a/src/conf/janetconf.h b/src/conf/janetconf.h
index 9f32eb6e..9958ebc4 100644
--- a/src/conf/janetconf.h
+++ b/src/conf/janetconf.h
@@ -5,9 +5,9 @@
 
 #define JANET_VERSION_MAJOR 1
 #define JANET_VERSION_MINOR 18
-#define JANET_VERSION_PATCH 1
-#define JANET_VERSION_EXTRA ""
-#define JANET_VERSION "1.18.1"
+#define JANET_VERSION_PATCH 2
+#define JANET_VERSION_EXTRA "-dev"
+#define JANET_VERSION "1.18.2-dev"
 
 /* #define JANET_BUILD "local" */