From c9a24ac96c3e7c044b3a4af82c36d1a3b247d402 Mon Sep 17 00:00:00 2001
From: brian crabtree <tehn@monome.org>
Date: Mon, 27 Sep 2021 08:35:26 -0400
Subject: [PATCH] 210827

---
 update/changelog.txt | 22 ++++++++++++++++++++--
 update/version.txt   |  2 +-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/update/changelog.txt b/update/changelog.txt
index ba2c41e5c..faa900c8d 100644
--- a/update/changelog.txt
+++ b/update/changelog.txt
@@ -1,13 +1,31 @@
-# 210826
+# 210927
 
-# norns-beta
+# norns 2.6.0
 
 - NEW hooks and mods system @ngwese @catfact
+- NEW custom events, c bindings @ngwese
 - NEW sequins library @tyleretters @trentgill
+- NEW softcut non-real-time functions @ryleelyman
 - NEW keyboard layouts @p3r7
 - NEW hold K1 in SELECT to fast-scroll @dndrks
 - FIX util.wrap and util.wrap_max bounds @dndrks
 - FIX tab.count @discohead
+- FIX crash when detecting crow @nihilazo
+- FIX numerous docker-related fixes @winder
+- FIX cleanup behavior with clean/load script @ngwese
+- FIX support PSETs above 99 @p3r7
+- NEW sky: add polyperc/polysub param def @ngwese
+- NEW textentry: add keyboard support @p3r7
+- NEW keyboard layouts menu selection @p3r7
+- FIX softcut phase inversion @catfact
+
+# maiden 1.1.4
+
+- NEW preview audio files on device in browser @stvnrlly
+- FIX explicit (instead of implicit) untitled script creation on initial landing view
+- NEW loading animation when loading scripts/audio into editor
+- NEW add version metadata to maiden cli @winder
+- NEW allow release builds for any architecture @winder
 
 
 # 210706
diff --git a/update/version.txt b/update/version.txt
index dc57b827a..8d41d031a 100644
--- a/update/version.txt
+++ b/update/version.txt
@@ -1 +1 @@
-210826
+210927