summaryrefslogtreecommitdiff
path: root/AUTHORS
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2017-02-19 08:12:05 -0800
committerGerald Combs <gerald@wireshark.org>2017-02-19 16:12:11 +0000
commitef20188bf6b7170cef5f0d0b86f929f74e852dc4 (patch)
treebf1f3ed17c443ecfc0db07cd42d99bb426644aa7 /AUTHORS
parente2951a2ca8dd10c7c9e514c45ba8d4b2204b0b71 (diff)
downloadwireshark-ef20188bf6b7170cef5f0d0b86f929f74e852dc4.tar.gz
[Automatic update for 2017-02-19]
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I2796bfe2a186adfe14adaf09c0fef65e765c474a Reviewed-on: https://code.wireshark.org/review/20183 Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS2
1 files changed, 2 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS
index 644bd98c89..fc954962ce 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4141,6 +4141,7 @@ Joakim Karlsson <oakimk[AT]gmail.com>
Johan Wahl <johan.wahl[AT]ericsson.com>
John A. Thacker <johnthacker[AT]gmail.com>
John Miner <optommp[AT]gmail.com>
+John Viklund <john.viklund[AT]effnet.com>
Jonas Falkevik <jonas.falkevik[AT]gmail.com>
Jonathan Brucker <jonathan.brucke[AT]gmail.com>
Jonathan Muñoz <jonathan.munoz[AT]inria.fr>
@@ -4186,6 +4187,7 @@ Marcel Essig <marcel.essig[AT]gmx.de>
Marian Ďurkovič <md[AT]bts.sk>
Marius <mareko.paliga[AT]gmail.com>
Mark Cunningham <launchpad[AT]markcunningham.ie>
+Mark Phillips <mark.phil[AT]samsung.com>
Mark Weel <markweel[AT]hotmail.com>
MarkPhillips <mark.s.phillips[AT]outlook.com>
Marko Hrastovec <marko.hrastovec[AT]gmail.com>