# HG changeset patch # User David Demelier # Date 1593769089 -7200 # Node ID 378dc1a023f05b7655291a5940b06158237a2107 # Parent e0de249c33784fce888af7bf2687f8bf5d59dfd5# Parent f46f74d118d5b8784750e8f4b3c60eac08d50f8b misc: merge from stable-3 diff -r e0de249c3378 -r 378dc1a023f0 .hgsigs --- a/.hgsigs Fri Jul 03 11:34:15 2020 +0200 +++ b/.hgsigs Fri Jul 03 11:38:09 2020 +0200 @@ -11,3 +11,4 @@ b83f4bbdaa9ec28ea547a7cefbb0b0475af9d1fa 0 iQEzBAABCAAdFiEEvr8S/JLqYAXrLA5Xodr5uEAj8x8FAl1r4kQACgkQodr5uEAj8x8QcQgAiF1iMgk34pwFDpNFcnwz0E0OE0VwKzn2mL3knXq8wAdi4MBjPo1tR85iPvavIfq6/FMtrJvZGQiKJv99iWgkWQ6uI8scWYwmkkheTpVtYNXxPjFGgoEm9wFvMki/jjmXkxssSanJsXHw10i2uWucRM+kky7jQcLZFsHmMDV8ZEhjE3mUJ1Zlx1s3yHs/tZzK92Bq0yMowwebdq8X+wLTAswNQbMxgxuJhQFIE14p9sIsmMcZQkwb5ldVaEV80m63EdXUtiMkWz9sR4gIgk4i7otPSU9GbKKmHys1oxDS9coKUvv12NG0RR5cpiVv70z77NJzi0sOnD3nK/6g+GZqTQ== 3e0b2fc5f79ebc40233ee9f8b7ea0c178f72c64a 0 iQEzBAABCAAdFiEEvr8S/JLqYAXrLA5Xodr5uEAj8x8FAl2Hx3cACgkQodr5uEAj8x/YDQgAi4V8IsKc7u0fJjINnlLRa37JfgwRqtADJkyT9a1GR+BfbB3XT3/VgBFYx0SDFvbW9lQ7ZmOLaLd5tMJap5xzrK+yUl3ctgWLZMZUyUKdsxYOcN19x6qkKK06E7hBZqif/OfKvMq96xScRBKCdHh8mASmzjyIMszcnVVc/pH3Joy5gayM5wobJqRFeP/JIbdKaHM0V04O25j04yfJSZwaxYNQUQGi7vSSrB1die8r1HtHw8bYOxGA6FOjCoC7xUv9RD1UaXsKVTfChechFNHdKGSSP/r0gGG4mB6pYY6jmeoHOJR27wZrmfWvHYrgWasZK6pkcZ5ywy0eubdXMrG/0A== 4c68a73f31e92afe2a5986f810b299c1de28ba5a 0 iQEzBAABCAAdFiEEvr8S/JLqYAXrLA5Xodr5uEAj8x8FAl2ZlTYACgkQodr5uEAj8x+FOgf/QOK/lRL2RY9i3frA3V8wbUz8o3iQmSE2rkWpWP2NacgIyAFwer/APJi7FecsZgJflwBHfXD06YH4V9lycVXmu0nJFMofSyMeWlUntzIjouBwjt7FtO80UJ0dARr6Czbsp2rUYBnz32lewS3ay6hkNHOOxCfj+Qpg8xDYSyW6mHzmeOJ5W9CL7brAaJlYO+es3zVgfA66PVmXskknjSaghLXnWH/irwJ08dS0rkAz8ltXuuzoqxOoHZyhV9Ib+i/GXnMCM4Xs7YLELmkK3hpCXpWA2RooN/4igiMs4J4DFmwiI85TZhPJyDTzhbvKwsCr+QGB5MDIC9UAZhg1hlNxQw== +52334419194e8e256fcee202d8ea163b3d1e08d6 0 iQEzBAABCAAdFiEEvr8S/JLqYAXrLA5Xodr5uEAj8x8FAl7+/EgACgkQodr5uEAj8x+1ZQgAthVpFrD0iGZf3bG9bI0BfLxccWCPEhjLs+gIvnt5dl3lh83SQ+8M3D6Jo8mCR3r3WWVKlqa8f0a4L8MxV+GRv6CGeyMrzjzIFipDWm1gU+6nGssNuHp7neC4XECaI3Iu2150Qz3t6Ugdgbo2sqAgUc0BspJhITwoR7UNDmG894fNYlDLpwVYYEP8NU6i4efeD0IPMNzESl+WhJL6VCmBoESlwOCXTMR13ugyibnWmnyPNfH90/vpx1ZL/6woUgO+0QD94Bv5sAtbvSbwSMwJ351p0b9e05bd6PpTIT25HxTIpZyWmAmUroSjNV88KGdG3fJ3rTX5rXSOWArL5j9G4g== diff -r e0de249c3378 -r 378dc1a023f0 .hgtags --- a/.hgtags Fri Jul 03 11:34:15 2020 +0200 +++ b/.hgtags Fri Jul 03 11:38:09 2020 +0200 @@ -11,3 +11,4 @@ d1cfe59eed061121da5325414c59262a8a2b085f 3.0.1 9f953fb28a607c62815da41ee6c9d4cfabbc5eac 3.0.2 f14e00397e429c0f9d38b1f0777293e1577d6994 3.0.3 +49b25adcd313a1b6df225540b0a2107fb4607da5 3.1.0 diff -r e0de249c3378 -r 378dc1a023f0 CHANGES.md --- a/CHANGES.md Fri Jul 03 11:34:15 2020 +0200 +++ b/CHANGES.md Fri Jul 03 11:38:09 2020 +0200 @@ -1,7 +1,7 @@ IRC Client Daemon CHANGES ========================= -irccd current +irccd 3.1.0 2020-07-03 ---------------------- irccd: diff -r e0de249c3378 -r 378dc1a023f0 cmake/IrccdVersion.cmake --- a/cmake/IrccdVersion.cmake Fri Jul 03 11:34:15 2020 +0200 +++ b/cmake/IrccdVersion.cmake Fri Jul 03 11:38:09 2020 +0200 @@ -29,8 +29,8 @@ # Irccd version. set(IRCCD_VERSION_MAJOR "3") -set(IRCCD_VERSION_MINOR "0") -set(IRCCD_VERSION_PATCH "3") +set(IRCCD_VERSION_MINOR "1") +set(IRCCD_VERSION_PATCH "0") set(IRCCD_VERSION "${IRCCD_VERSION_MAJOR}.${IRCCD_VERSION_MINOR}.${IRCCD_VERSION_PATCH}${HG_REV}") set(IRCCD_VERSION_RAW "${IRCCD_VERSION_MAJOR}.${IRCCD_VERSION_MINOR}.${IRCCD_VERSION_PATCH}") set(IRCCD_VERSION_SHLIB "1") @@ -42,10 +42,10 @@ # IRCCD_RELEASE_DATE_MONTH 2 digits (01 = January) # IRCCD_RELEASE_DATE_DAY 2 digits (01 = first day of month) # -set(IRCCD_RELEASE_DATE_YEAR 2019) -set(IRCCD_RELEASE_DATE_MONTH 10) -set(IRCCD_RELEASE_DATE_DAY 06) +set(IRCCD_RELEASE_DATE_YEAR 2020) +set(IRCCD_RELEASE_DATE_MONTH 07) +set(IRCCD_RELEASE_DATE_DAY 03) set(IRCCD_RELEASE_DATE "${IRCCD_RELEASE_DATE_YEAR}-${IRCCD_RELEASE_DATE_MONTH}-${IRCCD_RELEASE_DATE_DAY}") # Irccd release data (manual version). -set(IRCCD_MAN_DATE "October 06, 2019") +set(IRCCD_MAN_DATE "July 03, 2020")