summaryrefslogtreecommitdiff
path: root/AUTHORS
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@250bpm.com>2010-02-19 15:25:05 +0100
committerMartin Sustrik <sustrik@250bpm.com>2010-02-19 15:25:05 +0100
commitaff1f6621ae13083c7f15f7f1f808560254a2dcb (patch)
tree9e73dd8bd5d38a21e0aa83b4d4bea55b7792b39e /AUTHORS
parent75f571c8844231f4172f131e1dd6ba2348eb54e5 (diff)
parent2a79a943de417679c562cd4a917e1d1bc19b0d25 (diff)
Merge branch 'master' of git@github.com:sustrik/zeromq2
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS2
1 files changed, 2 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS
index 24e980b..8e2bd72 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4,6 +4,7 @@ Contributors
Alexej Lotz
Asko Kauppi
Barak Amar
+Chris Wong
Conrad D. Steenberg
Dhruva Krishnamurthy
Dirk O. Kaar
@@ -18,6 +19,7 @@ Martin Hurton
Martin Lucina
Martin Sustrik
Matus Hamorsky
+McClain Looney
Pavel Gushcha
Pavol Malosek
Steven McCoy