aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDario Lombardo <lomato@gmail.com>2020-01-05 23:31:53 +0100
committerDario Lombardo <lomato@gmail.com>2020-01-07 16:52:34 +0000
commit1e0fa912d4e7874194d5c95eca284e1767a5578d (patch)
tree9570b3d89b8e838b12b561c59d166b21ee97b94b
parentb6b7065b7c654ba0e1b872cef38a298033c8f26b (diff)
AUTHORS: remove newlines.
The text is used in a Qt widget that handles the newlines itself. The change makes the text appear with a better look in the about dialog. Change-Id: I1dc9fdd1f401384f4ce2d6c2c0764adaa810a654 Reviewed-on: https://code.wireshark.org/review/35662 Reviewed-by: Guy Harris <guy@alum.mit.edu> Reviewed-by: Dario Lombardo <lomato@gmail.com>
-rw-r--r--AUTHORS28
-rw-r--r--AUTHORS.src30
-rwxr-xr-xtools/generate_authors.pl28
3 files changed, 25 insertions, 61 deletions
diff --git a/AUTHORS b/AUTHORS
index 7fd85183d3..8f2c7d94fc 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4768,32 +4768,20 @@ zhudewen <zhudewen[AT]iauto.com>
= Acknowledgements =
-Dan Lasley <dlasley[AT]promus.com> gave permission for his
-dumpit() hex-dump routine to be used.
+Dan Lasley <dlasley[AT]promus.com> gave permission for his dumpit() hex-dump routine to be used.
-Mattia Cazzola <mattiac[AT]alinet.it> provided a patch to the
-hex dump display routine.
+Mattia Cazzola <mattiac[AT]alinet.it> provided a patch to the hex dump display routine.
-We use the exception module from Kazlib, a C library written by
-Kaz Kylheku <kaz[AT]kylheku.com>. Thanks go to him for
-his well-written library. The Kazlib home page can be found at
-http://www.kylheku.com/~kaz/kazlib.html
+We use the exception module from Kazlib, a C library written by Kaz Kylheku <kaz[AT]kylheku.com>. Thanks go to him for his well-written library. The Kazlib home page can be found at http://www.kylheku.com/~kaz/kazlib.html
-We use Lua BitOp, written by Mike Pall, for bitwise operations
-on numbers in Lua. The Lua BitOp home page can be found at
-https://bitop.luajit.org
+We use Lua BitOp, written by Mike Pall, for bitwise operations on numbers in Lua. The Lua BitOp home page can be found at https://bitop.luajit.org
-snax <snax[AT]shmoo.com> gave permission to use his(?) weak key
-detection code from Airsnort.
+snax <snax[AT]shmoo.com> gave permission to use his(?) weak key detection code from Airsnort.
IANA gave permission for their port-numbers file to be used.
-We use the natural order string comparison algorithm, written by
-Martin Pool <mbp[AT]sourcefrog.net>.
+We use the natural order string comparison algorithm, written by Martin Pool <mbp[AT]sourcefrog.net>.
-Emanuel Eichhammer <support[AT]qcustomplot.com> granted permission
-to use QCustomPlot.
+Emanuel Eichhammer <support[AT]qcustomplot.com> granted permission to use QCustomPlot.
-Insecure.Com LLC ("The Nmap Project") has granted the Wireshark
-Foundation permission to distribute Npcap with our Windows
-installers.
+Insecure.Com LLC ("The Nmap Project") has granted the Wireshark Foundation permission to distribute Npcap with our Windows installers.
diff --git a/AUTHORS.src b/AUTHORS.src
index 908660e4b2..d89ee4087a 100644
--- a/AUTHORS.src
+++ b/AUTHORS.src
@@ -3981,36 +3981,24 @@ Håkon Øye Amundsen <haakon.amundsen[AT]nordicsemi.no>
= Acknowledgements =
-Dan Lasley <dlasley[AT]promus.com> gave permission for his
-dumpit() hex-dump routine to be used.
+Dan Lasley <dlasley[AT]promus.com> gave permission for his dumpit() hex-dump routine to be used.
-Mattia Cazzola <mattiac[AT]alinet.it> provided a patch to the
-hex dump display routine.
+Mattia Cazzola <mattiac[AT]alinet.it> provided a patch to the hex dump display routine.
-We use the exception module from Kazlib, a C library written by
-Kaz Kylheku <kaz[AT]kylheku.com>. Thanks go to him for
-his well-written library. The Kazlib home page can be found at
-http://www.kylheku.com/~kaz/kazlib.html
+We use the exception module from Kazlib, a C library written by Kaz Kylheku <kaz[AT]kylheku.com>. Thanks go to him for his well-written library. The Kazlib home page can be found at http://www.kylheku.com/~kaz/kazlib.html
-We use Lua BitOp, written by Mike Pall, for bitwise operations
-on numbers in Lua. The Lua BitOp home page can be found at
-http://bitop.luajit.org/
+We use Lua BitOp, written by Mike Pall, for bitwise operations on numbers in Lua. The Lua BitOp home page can be found at http://bitop.luajit.org/
-Henrik Brix Andersen <brix[AT]gimp.org> gave permission for his
-webbrowser calling routine to be used.
+Henrik Brix Andersen <brix[AT]gimp.org> gave permission for his webbrowser calling routine to be used.
-Christophe Devine <c.devine[AT]cr0.net> gave permission for his
-SHA1 routines to be used.
+Christophe Devine <c.devine[AT]cr0.net> gave permission for his SHA1 routines to be used.
-snax <snax[AT]shmoo.com> gave permission to use his(?) weak key
-detection code from Airsnort.
+snax <snax[AT]shmoo.com> gave permission to use his(?) weak key detection code from Airsnort.
IANA gave permission for their port-numbers file to be used.
-We use the natural order string comparison algorithm, written by
-Martin Pool <mbp[AT]sourcefrog.net>.
+We use the natural order string comparison algorithm, written by Martin Pool <mbp[AT]sourcefrog.net>.
-Emanuel Eichhammer <support[AT]qcustomplot.com> granted permission
-to use QCustomPlot.
+Emanuel Eichhammer <support[AT]qcustomplot.com> granted permission to use QCustomPlot.
Some icons made by Freepik, http://www.freepik.com from https://www.flaticon.com
diff --git a/tools/generate_authors.pl b/tools/generate_authors.pl
index 92db3d8195..20512d17e0 100755
--- a/tools/generate_authors.pl
+++ b/tools/generate_authors.pl
@@ -37,35 +37,23 @@ my $trailer = "
= Acknowledgements =
-Dan Lasley <dlasley[AT]promus.com> gave permission for his
-dumpit() hex-dump routine to be used.
+Dan Lasley <dlasley[AT]promus.com> gave permission for his dumpit() hex-dump routine to be used.
-Mattia Cazzola <mattiac[AT]alinet.it> provided a patch to the
-hex dump display routine.
+Mattia Cazzola <mattiac[AT]alinet.it> provided a patch to the hex dump display routine.
-We use the exception module from Kazlib, a C library written by
-Kaz Kylheku <kaz[AT]kylheku.com>. Thanks go to him for
-his well-written library. The Kazlib home page can be found at
-http://www.kylheku.com/~kaz/kazlib.html
+We use the exception module from Kazlib, a C library written by Kaz Kylheku <kaz[AT]kylheku.com>. Thanks go to him for his well-written library. The Kazlib home page can be found at http://www.kylheku.com/~kaz/kazlib.html
-We use Lua BitOp, written by Mike Pall, for bitwise operations
-on numbers in Lua. The Lua BitOp home page can be found at
-https://bitop.luajit.org
+We use Lua BitOp, written by Mike Pall, for bitwise operations on numbers in Lua. The Lua BitOp home page can be found at https://bitop.luajit.org
-snax <snax[AT]shmoo.com> gave permission to use his(?) weak key
-detection code from Airsnort.
+snax <snax[AT]shmoo.com> gave permission to use his(?) weak key detection code from Airsnort.
IANA gave permission for their port-numbers file to be used.
-We use the natural order string comparison algorithm, written by
-Martin Pool <mbp[AT]sourcefrog.net>.
+We use the natural order string comparison algorithm, written by Martin Pool <mbp[AT]sourcefrog.net>.
-Emanuel Eichhammer <support[AT]qcustomplot.com> granted permission
-to use QCustomPlot.
+Emanuel Eichhammer <support[AT]qcustomplot.com> granted permission to use QCustomPlot.
-Insecure.Com LLC (\"The Nmap Project\") has granted the Wireshark
-Foundation permission to distribute Npcap with our Windows
-installers.
+Insecure.Com LLC (\"The Nmap Project\") has granted the Wireshark Foundation permission to distribute Npcap with our Windows installers.
";
my $git_log_text = "