diff options
| author | Dario Lombardo <lomato@gmail.com> | 2018-03-07 14:08:18 +0100 |
|---|---|---|
| committer | Jaap Keuter <jaap.keuter@xs4all.nl> | 2018-03-07 17:18:47 +0000 |
| commit | 692cef88c7f68af53e9487e3e2264de8d98b230b (patch) | |
| tree | 517adc3bfd45577ea7cf88875c781ca949140e5d /epan/dissectors/asn1/p7 | |
| parent | 5375283f9294d444fcda14df74fed77160bf1d1d (diff) | |
dissectors: more SPDX license convertions.
Change-Id: I96e1f1cdbaaf49d65705ecacc903f73cf0e47d7c
Reviewed-on: https://code.wireshark.org/review/26334
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Diffstat (limited to 'epan/dissectors/asn1/p7')
| -rw-r--r-- | epan/dissectors/asn1/p7/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | epan/dissectors/asn1/p7/Makefile.am | 14 |
2 files changed, 2 insertions, 26 deletions
diff --git a/epan/dissectors/asn1/p7/CMakeLists.txt b/epan/dissectors/asn1/p7/CMakeLists.txt index 7c3d0851e6..1f6632cffd 100644 --- a/epan/dissectors/asn1/p7/CMakeLists.txt +++ b/epan/dissectors/asn1/p7/CMakeLists.txt @@ -4,19 +4,7 @@ # By Gerald Combs <gerald@wireshark.org> # Copyright 1998 Gerald Combs # -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# SPDX-License-Identifier: GPL-2.0-or-later # set( PROTOCOL_NAME p7 ) diff --git a/epan/dissectors/asn1/p7/Makefile.am b/epan/dissectors/asn1/p7/Makefile.am index 6b45925bb8..592bb46226 100644 --- a/epan/dissectors/asn1/p7/Makefile.am +++ b/epan/dissectors/asn1/p7/Makefile.am @@ -2,19 +2,7 @@ # By Gerald Combs <gerald@wireshark.org> # Copyright 1998 Gerald Combs # -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# SPDX-License-Identifier: GPL-2.0-or-later include ../Makefile.inc |