# HG changeset patch # User David Demelier # Date 1609752617 -3600 # Node ID 5ec14fdb00cf0318bf5ccbbe8a8831de62c87a57 # Parent d585adeee610fa399e60c6c12b3a36858950f9e8# Parent 85feff0a2edfd09468f1ed767d3dafd59062b721 misc: merge from stable-3 diff -r d585adeee610 -r 5ec14fdb00cf .hgsigs --- a/.hgsigs Mon Jan 04 10:27:54 2021 +0100 +++ b/.hgsigs Mon Jan 04 10:30:17 2021 +0100 @@ -12,3 +12,4 @@ 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== +45110aed06f0e483c1f6243cde3f24078819d10a 0 iQEzBAABCAAdFiEEvr8S/JLqYAXrLA5Xodr5uEAj8x8FAl/y4AYACgkQodr5uEAj8x+HzAf9FZkgYj3W4Bx2bwfqG4st4bes2Ucv18QcStp15mu6ukxRroPzj3Q9YwN0Y97yLrq6LJnMx8+O+NV4R5CSgiATZ+6yvezMH7dkJasU6P9r26XoPUno7NIf+QaHEGXrCDljQd4N+EaM/qpxD9PW46Lf2LGO47f3C84Z4h3MKqc3LJEuK9sGsolcFaaSizmpOaLAez2mzxBst1TalHrJHeolS8jyZWtqNWtm5gzxXhIrbQPKZbiOhdcf6b2adKpgNP3mlpNqQDtoOOeFXyDRunP8QFiPOYimjsHrVY2U3ltF/b3U+dHEjk54MQ3U8u/wZVeqUQS7yghYk2g67EORZwcNJA== diff -r d585adeee610 -r 5ec14fdb00cf .hgtags --- a/.hgtags Mon Jan 04 10:27:54 2021 +0100 +++ b/.hgtags Mon Jan 04 10:30:17 2021 +0100 @@ -12,3 +12,4 @@ 9f953fb28a607c62815da41ee6c9d4cfabbc5eac 3.0.2 f14e00397e429c0f9d38b1f0777293e1577d6994 3.0.3 49b25adcd313a1b6df225540b0a2107fb4607da5 3.1.0 +c0408dc4a74a19554ae7b024e9e609ac0478a021 3.1.1 diff -r d585adeee610 -r 5ec14fdb00cf cmake/IrccdVersion.cmake --- a/cmake/IrccdVersion.cmake Mon Jan 04 10:27:54 2021 +0100 +++ b/cmake/IrccdVersion.cmake Mon Jan 04 10:30:17 2021 +0100 @@ -30,7 +30,7 @@ # Irccd version. set(IRCCD_VERSION_MAJOR "3") set(IRCCD_VERSION_MINOR "1") -set(IRCCD_VERSION_PATCH "0") +set(IRCCD_VERSION_PATCH "1") 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 2020) -set(IRCCD_RELEASE_DATE_MONTH 07) -set(IRCCD_RELEASE_DATE_DAY 03) +set(IRCCD_RELEASE_DATE_YEAR 2021) +set(IRCCD_RELEASE_DATE_MONTH 01) +set(IRCCD_RELEASE_DATE_DAY 04) 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 "July 03, 2020") +set(IRCCD_MAN_DATE "January 04, 2021")