From 8cd389e16166fa4c075fbddfe69f26653a0169b3 Mon Sep 17 00:00:00 2001
From: Dario Lombardo <lomato@gmail.com>
Date: Wed, 7 Feb 2018 12:26:45 +0100
Subject: replace SPDX identifier GPL-2.0+ with GPL-2.0-or-later.

The first is deprecated, as per https://spdx.org/licenses/.

Change-Id: I8e21e1d32d09b8b94b93a2dc9fbdde5ffeba6bed
Reviewed-on: https://code.wireshark.org/review/25661
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
---
 mergecap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mergecap.c')

diff --git a/mergecap.c b/mergecap.c
index 98a32b8b2d..73cb8439a5 100644
--- a/mergecap.c
+++ b/mergecap.c
@@ -4,7 +4,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  *
  * Mergecap written by Scott Renfro <scott@renfro.org> based on
  * editcap by Richard Sharpe and Guy Harris
-- 
cgit v1.2.3