diff options
author | ailin-nemui <ailin-nemui@users.noreply.github.com> | 2018-02-15 01:17:11 +0100 |
---|---|---|
committer | ailin-nemui <ailin-nemui@users.noreply.github.com> | 2018-02-15 01:18:37 +0100 |
commit | 0b9beeb01d4ff3890120ace913884fcd915e4b26 (patch) | |
tree | f211db10fa2b735d63e3db5bdcb9863ac2c14ff0 | |
parent | 666ddc2ecdd9ad7bc966c78565a5fd9985e099c8 (diff) | |
download | irssi-0b9beeb01d4ff3890120ace913884fcd915e4b26.zip |
Merge tag '1.1.1' into integrate/1.1.1
-rw-r--r-- | NEWS | 7 | ||||
-rw-r--r-- | configure.ac | 2 |
2 files changed, 8 insertions, 1 deletions
@@ -1,5 +1,12 @@ v1.2-head 2018-xx-xx The Irssi team <staff@irssi.org> +v1.1.1 2018-02-15 The Irssi team <staff@irssi.org> + ! Contains all changes from 1.0.7 + - Restore compatibility with OpenSSL < 1.0.2 (#820, #831) + - Fix test compilation on some platforms (#815, #816) + - Fix portability and backwards compatibility of test runner + (#818, #845) + v1.0.7 2018-02-15 The Irssi team <staff@irssi.org> - Prevent use after free error during the execution of some commands. Found by Joseph Bisch (GL#17, GL!24). diff --git a/configure.ac b/configure.ac index e8df7d9e..0231e109 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT(irssi, 1.1-head) +AC_INIT(irssi, 1.2-head) AC_CONFIG_SRCDIR([src]) AC_CONFIG_AUX_DIR(build-aux) AC_PREREQ(2.50) |