diff options
author | Dario Lombardo <lomato@gmail.com> | 2018-03-06 15:31:02 +0100 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2018-03-07 15:56:44 +0000 |
commit | fe71e26af27a01173f3029a7d848b9ba65a0defb (patch) | |
tree | 3805e0616d1264998c622b59a238490237443e57 /epan/dfilter | |
parent | 71f36379aef2ff9fcf092619011f02f68ce9d3b2 (diff) |
spdx: more licenses converted.
Change-Id: I3861061ec261e63b23621799e020e811ed78a343
Reviewed-on: https://code.wireshark.org/review/26333
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dfilter')
-rw-r--r-- | epan/dfilter/CMakeLists.txt | 14 | ||||
-rw-r--r-- | epan/dfilter/scanner.l | 14 |
2 files changed, 2 insertions, 26 deletions
diff --git a/epan/dfilter/CMakeLists.txt b/epan/dfilter/CMakeLists.txt index 8ce5dc887f..4b19cf9448 100644 --- a/epan/dfilter/CMakeLists.txt +++ b/epan/dfilter/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 # include_directories( diff --git a/epan/dfilter/scanner.l b/epan/dfilter/scanner.l index 63850cd178..93aaa195fc 100644 --- a/epan/dfilter/scanner.l +++ b/epan/dfilter/scanner.l @@ -58,19 +58,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 2001 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 <stdlib.h> |