From fb85fdec5ca48a9a24d8dc9482ac7c5490c5dffc Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@z30a.localdomain>
Date: Fri, 28 Jun 2019 23:04:45 +0200
Subject: [PATCH] Merge tag '1.2.1' into integrate/1.2.1

---
 NEWS | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/NEWS b/NEWS
index c0835b93..2df16223 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,16 @@
 v1.3-head 2019-xx-xx  The Irssi team <staff@irssi.org>
 
+v1.2.1 2019-06-29 The Irssi team <staff@irssi.org>
+	! Contains all changes from 1.1.3
+	- Fix a test on big endian machines (#1014)
+	- Fix the compile time conditionality of wcwidth
+          implementation (#1019, gentoo#677804, #720)
+	- Fix /save no longer working on old Solaris (pre
+          POSIX.1-2008) (#1042, #1043)
+	- Fix regression of #764 where display of 8-bit (legacy
+          encoding) in the input prompt was broken (#1018,
+          #1057). Initial patch by Артём Курашов
+
 v1.1.3 2019-06-29 The Irssi team <staff@irssi.org>
 	! Contains all changes from 1.0.8
 	- Fix regression of #779 where autolog_ignore_targets would