diff options
| author | Martin Sustrik <sustrik@250bpm.com> | 2010-09-02 08:07:40 +0200 |
|---|---|---|
| committer | Martin Sustrik <sustrik@250bpm.com> | 2010-09-02 08:07:40 +0200 |
| commit | 0a1f7e3524338690551c04ebfccd896a0b96f399 (patch) | |
| tree | 1f2c533e9394cd8f21977b252c11abf027bd772a /AUTHORS | |
| parent | a81a37399b2ab4143aedf3ff4c442655b9e7e9b7 (diff) | |
| parent | 14853c2db528b3fd6eed84786053549e71f61bb7 (diff) | |
Merge branch 'maint'
* maint:
Prior to this patch prefix_tree asserts.
Fix for signaler_t on HP-UX and AIX platforms
Mikael Kjaer added to AUTHORS
Conflicts:
src/trie.cpp
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -5,6 +5,7 @@ Alexej Lotz <alexej.lotz@arcor.de> Asko Kauppi <askok@dnainternet.net> Barak Amar <barak.amar@gmail.com> Bernd Prager <bernd@prager.ws> +Bernd Melchers <melchers@ZEDAT.FU-Berlin.DE> Brian Buchanan <bwb@holo.org> Chris Wong <chris@chriswongstudio.com> Conrad D. Steenberg <conrad.steenberg@caltech.edu> @@ -25,6 +26,7 @@ Martin Lucina <mato@kotelna.sk> Martin Sustrik <sustrik@250bpm.com> Matus Hamorsky <mhamorsky@gmail.com> McClain Looney <m@loonsoft.com> +Mikael Helbo Kjaer <mhk@designtech.dk> Pavel Gushcha <pavimus@gmail.com> Pavol Malosek <malosek@fastmq.com> Pieter Hintjens <ph@imatix.com> |