aboutsummaryrefslogtreecommitdiffstats
path: root/AUTHORS
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2017-02-26 08:11:41 -0800
committerGerald Combs <gerald@wireshark.org>2017-02-26 16:11:56 +0000
commitd8e16b79da8d5fb41c33beea26c35c4617481f4d (patch)
tree19c6334442d7d6d6f922e154578cdb1503e6051a /AUTHORS
parentb3539fdf86988b0b8dae71d5de6983066903d5ff (diff)
[Automatic update for 2017-02-26]
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I3094033ff26c1d8da5abcc22a25e4075f6bc087f Reviewed-on: https://code.wireshark.org/review/20285 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 fc954962ce..67572cd8a2 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -3685,6 +3685,7 @@ Barbu Paul - Gheorghe <barbu.paul.gheorghe[AT]gmail.com> {
Martin Kacer <kacer.martin[AT]gmail.com> {
JSON and Elasticsearch tshark output
+ json2pcap
}
Ben Stewart <bst[AT]google.com> {
SCTE-35 dissector
@@ -4166,6 +4167,7 @@ Kenny Root <kenny[AT]the-b.org>
Kevin Bracey <kevin.bracey[AT]arm.com>
Kevin Grigorenko <kevin.grigorenko[AT]us.ibm.com>
Kevin Hogan <kwabena[AT]google.com>
+Kim Bäckström <kim.backstrom[AT]gmail.com>
Lars Sundström <lars.x.sundstrom[AT]ericsson.com>
Lasse Luttermann Poulsen <lasse.luttermann[AT]gmail.com>
Laurenz Kamp <laurenz.kamp[AT]gmx.de>