Mercurial > irccd
changeset 418:faebf6019e70
Merge from stable-2
| author | David Demelier <markand@malikania.fr> |
|---|---|
| date | Wed, 01 Feb 2017 11:53:22 +0100 |
| parents | 224e5cc2d243 (current diff) f65d04ae46ac (diff) |
| children | f1414576ceaa |
| files | |
| diffstat | 4 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsigs Thu Jan 26 14:06:48 2017 +0100 +++ b/.hgsigs Wed Feb 01 11:53:22 2017 +0100 @@ -2,3 +2,4 @@ 79de523688edfb418f0f9605033a2c8dac1cd7cf 0 iQEcBAABCAAGBQJW5dzPAAoJEKHa+bhAI/Mf0qIH/jmb/2Oltif7R2kSeQcW9NHfPlqF/gvOIN5FaraoYdkwHumwLxys5FzhIghkJgvNMT313Xez0UjtdSO/3ZmjX1P+D/Rz3NfMddFDyiXWMn8D/MVN6DskQw6mb4W9miB0fBl++pc4e7T0UvZdYar4ddOl6WE2HDda6828gq2ecBBEyTkPOglzbiRwm05zmAvE5DxjEElu/2V70oHJJUscHOnC8YZVJnav1Hq6iU5RTpmuBtY7TN6/+Q7i9o+4b1xkQ8zAVpu9gBo7ptVhQ8MSnIprwO+E8XFmQDA/67tDgquzURZvVRmehMCaWhljWVLTG3CVOVQEp/k9ip5CKRoE+oY= 02409acc34e21fa08a781f6f68aef66dc734a132 0 iQEcBAABCAAGBQJXFekwAAoJEKHa+bhAI/MfxG4IAK9Es4VcTU5HZ+VfpuFxjx5NcbEzbdqexUFI4m4Z8/LWD7Xb9RT0bekomEDHGT91csQFJ1es1Aeekbgw1XDk/wwYphaTUTNKF8L9VWRKdRbGQT8AjkOxJXfjMviGJbUa7lkQNllwLexvwPmnMJP8+A/QVf5EWlim8rxpeaKqrpwmizd4UhvLb7w5F5YyIHVsI8FizFL9VdnFplK+iQgSMX2mRUkAGOHCno7MIxilcmUGy/6yzV7VyuJHmkGjluBxURp73HQSAIVM3SwJagpWZS6zZ5tI5PFf6gw9rlByJJOLcbuuvUaAKLYhKISi5qlLmKRW097sJxCF4bgWfUVUp1w= ef19e4c406cf9611650fe25354170485ab27b819 0 iQEcBAABCAAGBQJYGI4KAAoJEKHa+bhAI/MfdlIH/jP3ktybzbMISVHeZOx5Kd6sQYyEQP5u0StQ3Sgj/oV+tqn3UWrTypKXJZWeI1yb3KYtHfcmP8l/nKeN0Zz3c05qh+J+MuBCoBNL1yP8ZHqarKrhPjkoC5OQoUgegsMEOcCBK7j8VXmSJ5DUXpn1Drd9dQ7qKE3fu84knHWe0ViVThbFFQsqBv5DQOgA+Pl5GN1JzeMWo/hWHjHldrsFC2xOeDJNuJ42RgmFmKaj7MHO9Nsu6aLZwDzkZvoImPzsO/AAQsrqAHC2um85LptCsWZ3LFw8aC1UqmlvvcdXLivChHs0+Qwr9VrGGlcaZ8mLaD4ucCG2LUR9EjmtwOCkJvc= +13097484da5145f5e83705aed9288c3f3d745375 0 iQEzBAABCAAdFiEEvr8S/JLqYAXrLA5Xodr5uEAj8x8FAliRvf0ACgkQodr5uEAj8x/MbQf7B8PnmQLQvB5URnAZiPQlxUwV/ueu1g2ygZaMv3shop9PQBDUHEkVso+kivGDrIhX+E94JeNno3L+FMaNigOHS67x2ycoaerk89COcTIfj426KyvBSJ/nP5m8Sx3AnXXjuqV83blQCOhi99lNE1o3Zw9UX9IwhIjZnLX6o48ybEhbh/DeXQ/qw4KIbqhA4LjE+UNndf0zDCgSN9DJXw3kUejRCNb7ygP/zkbnhpuM5prdzjHFsrAlGCtTAebB2Aq7oAn/ZYIJclh38E2j89fFxUbz8wg5JtXJBUQ2a4oGtByM6aKD8zXUMgTRHc/EfLvjlL8EoOZG8HkUM+kMcgPGDw==
--- a/.hgtags Thu Jan 26 14:06:48 2017 +0100 +++ b/.hgtags Wed Feb 01 11:53:22 2017 +0100 @@ -2,3 +2,4 @@ 02bb385da6e342bbfe232b10ab6d63c1d8c47ca7 2.0.1 de1c1e4a5dbb3f9d03a6833333f03f595f79e33d 2.0.2 d37069bcbbab340c122a4f6fbb028c02996cc143 2.0.3 +a8b0353ac831ef6cb9be9f92a634252a680169b0 2.1.0
--- a/CHANGES.md Thu Jan 26 14:06:48 2017 +0100 +++ b/CHANGES.md Wed Feb 01 11:53:22 2017 +0100 @@ -1,7 +1,7 @@ IRC Client Daemon CHANGES ========================= -irccd current +irccd 2.1.0 2017-02-01 ---------------------- Irccd:
--- a/cmake/IrccdVersion.cmake Thu Jan 26 14:06:48 2017 +0100 +++ b/cmake/IrccdVersion.cmake Wed Feb 01 11:53:22 2017 +0100 @@ -20,7 +20,7 @@ set(IRCCD_VERSION_MAJOR "2") set(IRCCD_VERSION_MINOR "1") set(IRCCD_VERSION_PATCH "0") -set(IRCCD_VERSION "${IRCCD_VERSION_MAJOR}.${IRCCD_VERSION_MINOR}.${IRCCD_VERSION_PATCH}-dev") +set(IRCCD_VERSION "${IRCCD_VERSION_MAJOR}.${IRCCD_VERSION_MINOR}.${IRCCD_VERSION_PATCH}") set(IRCCD_VERSION_SHLIB "2") # @@ -31,7 +31,7 @@ # IRCCD_RELEASE_DATE_MONTH 2 digits (01 = January) # IRCCD_RELEASE_DATE_DAY 2 digits (01 = first day of month) # -set(IRCCD_RELEASE_DATE_YEAR 2016) -set(IRCCD_RELEASE_DATE_MONTH 11) +set(IRCCD_RELEASE_DATE_YEAR 2017) +set(IRCCD_RELEASE_DATE_MONTH 02) set(IRCCD_RELEASE_DATE_DAY 01) set(IRCCD_RELEASE_DATE "${IRCCD_RELEASE_DATE_YEAR}-${IRCCD_RELEASE_DATE_MONTH}-${IRCCD_RELEASE_DATE_DAY}")