Merge pull request #1526 from igaw/clarify-lisence

author Daniel Wagner <dwagner@suse.de>

Wed, 18 May 2022 11:57:57 +0000 (13:57 +0200)

committer GitHub <noreply@github.com>

Wed, 18 May 2022 11:57:57 +0000 (13:57 +0200)
author Daniel Wagner <dwagner@suse.de>
Wed, 18 May 2022 11:57:57 +0000 (13:57 +0200)
committer GitHub <noreply@github.com>
Wed, 18 May 2022 11:57:57 +0000 (13:57 +0200)
diff --cc Documentation/meson.build
Simple merge
diff --cc plugins/meson.build
Simple merge
diff --cc plugins/wdc/wdc-nvme.c
Simple merge
diff --cc plugins/wdc/wdc-nvme.h
Simple merge
author	Daniel Wagner <dwagner@suse.de>
	Wed, 18 May 2022 11:57:57 +0000 (13:57 +0200)
committer	GitHub <noreply@github.com>
	Wed, 18 May 2022 11:57:57 +0000 (13:57 +0200)
		1	2
Documentation/meson.build	patch \|	diff1 \|	diff2 \|	blob \| history
plugins/meson.build	patch \|	diff1 \|	diff2 \|	blob \| history
plugins/wdc/wdc-nvme.c	patch \|	diff1 \|	diff2 \|	blob \| history
plugins/wdc/wdc-nvme.h	patch \|	diff1 \|	diff2 \|	blob \| history