Merge branch 'master' into hide-lines

This commit is contained in:
ailin-nemui 2017-11-26 00:31:01 +01:00 committed by GitHub
commit 466d074200
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
72 changed files with 2950 additions and 537 deletions

View file

@ -6,7 +6,7 @@
#define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
#define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
#define IRSSI_ABI_VERSION 11
#define IRSSI_ABI_VERSION 13
#define DEFAULT_SERVER_ADD_PORT 6667
#define DEFAULT_SERVER_ADD_TLS_PORT 6697