Mercurial > irccd
changeset 476:a2c61f1e548a
misc: merge from stable-2
| author | David Demelier <markand@malikania.fr> |
|---|---|
| date | Tue, 06 Nov 2018 11:09:42 +0100 |
| parents | eeabfc77d7ca (current diff) 019680df5d86 (diff) |
| children | bf201d09ee6a |
| files | |
| diffstat | 4 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsigs Tue Sep 26 12:27:42 2017 +0200 +++ b/.hgsigs Tue Nov 06 11:09:42 2018 +0100 @@ -6,3 +6,4 @@ 033d85c3c81e053368714174c22b692d99b03c24 0 iQEcBAABCAAGBQJYvpdpAAoJEKHa+bhAI/MfD68H/RSos3CKE1SU4n3iz0Y005J39nKVwYia8i4EPb1chuVS2qxiYISYCGHcmnALkIGYek8nSzEYAH6EoMoWnUz5WSYGuV0X5KH6722J+kgRlYn3l8ZgIt+cgOBfZh+91JCyIPSDRBCD3qF2bTXsgweX9F/iqWWRGIBcYLm/qw8YDaroiTm2kF9Txzs1VtJrLGLaltsndRj3v1sWyAeVD8xuKiF8v+zB1vZQQi75wSrhyovdQf13dy+GDUwqMZnZu+O9hTeq+mxIijGf+WXFLsBZ4Myxi1UNq5HAKO6kKKNMWdNnMqasL6VNx6D7dtDEJ1RV8DgbGsKUDFb957mdvLRFBr8= ae054128f365f9c91aa0f112a0b2c4c99265c00a 0 iQEcBAABAgAGBQJZWI5EAAoJEKHa+bhAI/MfWOIIAK7paY/J/qmm8tWi1zz981MqaJbXaL0+uLZCWNDXp3WjC237IHPa3bhLf5NL5bU4UnVwpBJSx9Sow4jrHZckuDSx+1I1cRoPngvsHDwo6YnekYHF2XX4ZI7NFQ+3D/IDYx+PQEKbQmw/XzxLGAfDzMLLo6mLfL8I/zak4fMprQ309Ka0lvsTdxiAzimYYVRN6MRVhVyv3udxQRGVU+waNCwzgfFZTjFHacFjBkY7PQWdVdtuf5uRyOiVF5HpBFf/Xi8eyfkRwRwKsSqsphkXPJctu8xeF9AYtu5/9x+T5L8SPK4fST1dRLdq0TZUFPhU/mgcVXiiqXpOagNQolKdjW0= b347b10d24c1f21737c677b5dcfbdcce97a2e945 0 iQEcBAABAgAGBQJZewPlAAoJEKHa+bhAI/MfXvcIAKX+kjUlKUxLqTkEPJYSTavlLwjdBoee1tesN7r4rMkxzy+WEHZnFEZToRgOqq4bcPS02J3XQcgZdHEysI43SezV44ZQVjdYyN2p2T98RuaXYXScE/pN7m0OFhiQHK6ozbeIRdDmx3i0l7ROYBiUmDWew0PZ4YULaLcSUnzELPYQfajCi2Vx4tmuKp42OG4gZQdgK60T2prl/tkzplS0TOErnPwCN0Vg+zJkD9JR9f9hsd7A2+3bkVyn7qe3HcgHzl6OsPt/P75siDpQv9lXA7s2mSYlzTmuffrviyms90K5ogbEkW56QQ8H8DGvtM5mLsIgNiatfAuXxAJfNj6FJj4= +d5bfaf362ded7a15e1c9da50805a7ee6a95b4875 0 iQEzBAABCAAdFiEEvr8S/JLqYAXrLA5Xodr5uEAj8x8FAlvhaEkACgkQodr5uEAj8x+EWwf/aeFmJ5JkHc/LsLSiHHwHQDIcnuyvRemz5VX/6um41jygTx3VUPYFC+mrtyql+ot5bstsI/9l8C1hFEAAimiIy7bhbALWdbqieJjBhXaUVSsJFq+YzOVR+k/6BZSJHTWL4lf4+Jic1ACsBWPXEQpyqxxdGpbmb7EXmx0ZZlXJIb1Xd0l/eev+ONIW9NwbabqvaoaUFab5BnrOu4LeZA1Ny2u7Wm2KJtyJAiJzwKfRjyDmJ7D0ljg7n24SzuxCC0vJS+drLd38dCaaYrLrL9WlndPql+IxTDByAGs9g/SkdJRis4ubDMXV92rLxZtdJZEyzoanethrFQn/s0Y0EOnGsg==
--- a/.hgtags Tue Sep 26 12:27:42 2017 +0200 +++ b/.hgtags Tue Nov 06 11:09:42 2018 +0100 @@ -6,3 +6,4 @@ 4022c5fa8b7c62b461380bc9a6cb150fe6a53186 2.1.1 315460895f853f525f2a5427109a6a05436429d7 2.1.2 c3f46ad1ece6c9eccfe42f0f683f01aa3a29da9f 2.1.3 +76aaaf7cd5a3410c97c644d3aa90bd2372c56aa4 2.2.0
--- a/CHANGES.md Tue Sep 26 12:27:42 2017 +0200 +++ b/CHANGES.md Tue Nov 06 11:09:42 2018 +0100 @@ -1,7 +1,7 @@ IRC Client Daemon CHANGES ========================= -irccd current +irccd 2.2.0 2017-09-26 ---------------------- - Add new Irccd.Util.cut function (#635),
--- a/cmake/IrccdVersion.cmake Tue Sep 26 12:27:42 2017 +0200 +++ b/cmake/IrccdVersion.cmake Tue Nov 06 11:09:42 2018 +0100 @@ -20,7 +20,7 @@ set(IRCCD_VERSION_MAJOR "2") set(IRCCD_VERSION_MINOR "2") 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") # @@ -32,6 +32,6 @@ # IRCCD_RELEASE_DATE_DAY 2 digits (01 = first day of month) # set(IRCCD_RELEASE_DATE_YEAR 2017) -set(IRCCD_RELEASE_DATE_MONTH 07) -set(IRCCD_RELEASE_DATE_DAY 28) +set(IRCCD_RELEASE_DATE_MONTH 09) +set(IRCCD_RELEASE_DATE_DAY 26) set(IRCCD_RELEASE_DATE "${IRCCD_RELEASE_DATE_YEAR}-${IRCCD_RELEASE_DATE_MONTH}-${IRCCD_RELEASE_DATE_DAY}")