v1.2.4

diff --git a/AUTHORS b/AUTHORS
index 4e0e8284e95dc63df54425ed5b5a15ee7ed83755..05b3f3eecc9a098cade38aba0baf007b505239f6 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -11,18 +11,21 @@
 Adrien Bustany <adrien@bustany.org>
 Caleb Spare <cespare@gmail.com>
 Case Nelson <case@teammating.com>
-Chris Howey <howeyc@gmail.com> <chris@howey.me>
+Chris Howey <chris@howey.me> <howeyc@gmail.com>
 Christoffer Buchholz <christoffer.buchholz@gmail.com>
 Dave Cheney <dave@cheney.net>
+Evan Phoenix <evan@fallingsnow.net>
 Francisco Souza <f@souza.cc>
 Hari haran <hariharan.uno@gmail.com>
 John C Barstow
 Kelvin Fo <vmirage@gmail.com>
+Ken-ichirou MATSUZAWA <chamas@h4.dion.ne.jp>
 Matt Layher <mdlayher@gmail.com>
 Nathan Youngman <git@nathany.com>
 Paul Hammond <paul@paulhammond.org>
 Pieter Droogendijk <pieter@binky.org.uk>
 Pursuit92 <JoshChase@techpursuit.net>
+Riku Voipio <riku.voipio@linaro.org>
 Rob Figueiredo <robfig@gmail.com>
 Soge Zhang <zhssoge@gmail.com>
 Tilak Sharma <tilaks@google.com>
@@ -32,3 +35,4 @@ Yukang <moorekang@gmail.com>
 bronze1man <bronze1man@gmail.com>
 debrando <denis.brandolini@gmail.com>
 henrikedwards <henrik.edwards@gmail.com>
+铁哥 <guotie.9@gmail.com>

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d0ede67573f0c3bf141ad92b82f4d79f6d68b774..208bcd740c40900b45d5f06360f05c485c77973d 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## master / 2015-10-17
+## v1.2.4 / 2015-10-17
 
 * inotify: use epoll_create1 for arm64 support (requires Linux 2.6.27 or later) [#100](https://github.com/go-fsnotify/fsnotify/pull/100) (thanks @suihkulokki)
 * inotify: fix path leaks [#73](https://github.com/go-fsnotify/fsnotify/pull/73) (thanks @chamaken)