From 27b89a0e969d79245ae8f554c40c3d332cc0d605 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= <flashcode@flashtux.org>
Date: Sat, 31 Mar 2018 13:58:13 +0200
Subject: [PATCH] core: update ChangeLog (issue #1171)

---
 ChangeLog.adoc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ChangeLog.adoc b/ChangeLog.adoc
index 03fcbfebc..dccfd249e 100644
--- a/ChangeLog.adoc
+++ b/ChangeLog.adoc
@@ -25,12 +25,14 @@ New features::
 Improvements::
 
   * core: allow merge of buffers by name in command /buffer (issue #1108, issue #1159)
+  * xfer: add option xfer.network.send_ack (issue #1171)
 
 Bug fixes::
 
   * irc: fix split of messages when server option "split_msg_max_length" is set to 0 (no split) (issue #1173)
   * irc: send whole IRC message including IRCv3 tags in the signals irc_in, irc_in2, irc_raw_in and irc_raw_in2 (issue #787)
   * irc: fix memory leak when receiving a message with IRCv3 tags
+  * xfer: set option TCP_NODELAY on socket when receiving a file via DCC (issue #1171)
 
 Documentation::