summaryrefslogtreecommitdiffstats
path: root/src/hci
diff options
context:
space:
mode:
authorMichael Brown2015-03-02 14:29:46 +0100
committerMichael Brown2015-03-02 17:35:29 +0100
commit2f020a8df3ad24d0d0bac9295c9cecb2ebba92f4 (patch)
treeeb6f49f4b9358fe64fdf6fa9b1c1e044e2530bef /src/hci
parent[legal] Relicense files under GPL2_OR_LATER_OR_UBDL (diff)
downloadipxe-2f020a8df3ad24d0d0bac9295c9cecb2ebba92f4.tar.gz
ipxe-2f020a8df3ad24d0d0bac9295c9cecb2ebba92f4.tar.xz
ipxe-2f020a8df3ad24d0d0bac9295c9cecb2ebba92f4.zip
[legal] Relicense files under GPL2_OR_LATER_OR_UBDL
These files cannot be automatically relicensed by util/relicense.pl since they either contain unusual but trivial contributions (such as the addition of __nonnull function attributes), or contain lines dating back to the initial git revision (and so require manual knowledge of the code's origin). Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/hci')
-rw-r--r--src/hci/editstring.c6
-rw-r--r--src/hci/tui/menu_ui.c6
2 files changed, 10 insertions, 2 deletions
diff --git a/src/hci/editstring.c b/src/hci/editstring.c
index 5f6f04d5..8cbce076 100644
--- a/src/hci/editstring.c
+++ b/src/hci/editstring.c
@@ -15,9 +15,13 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
+ *
+ * You can also choose to distribute this program under the terms of
+ * the Unmodified Binary Distribution Licence (as given in the file
+ * COPYING.UBDL), provided that you have satisfied its requirements.
*/
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
#include <assert.h>
#include <string.h>
diff --git a/src/hci/tui/menu_ui.c b/src/hci/tui/menu_ui.c
index 0a9566de..13bdf65e 100644
--- a/src/hci/tui/menu_ui.c
+++ b/src/hci/tui/menu_ui.c
@@ -15,9 +15,13 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
+ *
+ * You can also choose to distribute this program under the terms of
+ * the Unmodified Binary Distribution Licence (as given in the file
+ * COPYING.UBDL), provided that you have satisfied its requirements.
*/
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
/** @file
*