summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Brown2015-03-02 13:04:57 +0100
committerMichael Brown2015-03-02 15:17:31 +0100
commite24be567f47953d93338278bb8bdc8b1b2e748b5 (patch)
treee68e346b318375b77d5791b19d2072f5b415d4a2
parent[legal] Relicense files under GPL2_OR_LATER_OR_UBDL (diff)
downloadipxe-e24be567f47953d93338278bb8bdc8b1b2e748b5.tar.gz
ipxe-e24be567f47953d93338278bb8bdc8b1b2e748b5.tar.xz
ipxe-e24be567f47953d93338278bb8bdc8b1b2e748b5.zip
[legal] Relicense files under GPL2_OR_LATER_OR_UBDL
Relicense files authored by Dan Lynch while working as an employee of Fen Systems Ltd., with permission from Fen Systems Ltd. Signed-off-by: Michael Brown <mcb30@ipxe.org>
-rw-r--r--src/hci/mucurses/alert.c2
-rw-r--r--src/hci/mucurses/ansi_screen.c2
-rw-r--r--src/hci/mucurses/clear.c2
-rw-r--r--src/hci/mucurses/colour.c2
-rw-r--r--src/hci/mucurses/cursor.h2
-rw-r--r--src/hci/mucurses/edging.c2
-rw-r--r--src/hci/mucurses/kb.c2
-rw-r--r--src/hci/mucurses/mucurses.c2
-rw-r--r--src/hci/mucurses/mucurses.h2
-rw-r--r--src/hci/mucurses/print.c2
-rw-r--r--src/hci/mucurses/print_nadv.c2
-rw-r--r--src/hci/mucurses/slk.c2
-rw-r--r--src/hci/mucurses/winattrs.c2
-rw-r--r--src/hci/mucurses/windows.c2
-rw-r--r--src/hci/mucurses/wininit.c2
15 files changed, 15 insertions, 15 deletions
diff --git a/src/hci/mucurses/alert.c b/src/hci/mucurses/alert.c
index 833330a0..7dc61c22 100644
--- a/src/hci/mucurses/alert.c
+++ b/src/hci/mucurses/alert.c
@@ -7,7 +7,7 @@
*
*/
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
/**
* Audible signal
diff --git a/src/hci/mucurses/ansi_screen.c b/src/hci/mucurses/ansi_screen.c
index 1d3143f8..1cf3309d 100644
--- a/src/hci/mucurses/ansi_screen.c
+++ b/src/hci/mucurses/ansi_screen.c
@@ -3,7 +3,7 @@
#include <ipxe/ansicol.h>
#include <ipxe/console.h>
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
static void ansiscr_reset(struct _curses_screen *scr) __nonnull;
static void ansiscr_movetoyx(struct _curses_screen *scr,
diff --git a/src/hci/mucurses/clear.c b/src/hci/mucurses/clear.c
index f5e52ca2..2054f72c 100644
--- a/src/hci/mucurses/clear.c
+++ b/src/hci/mucurses/clear.c
@@ -8,7 +8,7 @@
*
*/
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
/**
* Clear a window to the bottom from current cursor position
diff --git a/src/hci/mucurses/colour.c b/src/hci/mucurses/colour.c
index c1359c86..b0c480b1 100644
--- a/src/hci/mucurses/colour.c
+++ b/src/hci/mucurses/colour.c
@@ -1,6 +1,6 @@
#include <curses.h>
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
struct colour_pair {
short fcol;
diff --git a/src/hci/mucurses/cursor.h b/src/hci/mucurses/cursor.h
index 16b7d27c..2e0c896a 100644
--- a/src/hci/mucurses/cursor.h
+++ b/src/hci/mucurses/cursor.h
@@ -7,7 +7,7 @@
*
*/
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
struct cursor_pos {
unsigned int y, x;
diff --git a/src/hci/mucurses/edging.c b/src/hci/mucurses/edging.c
index bbee0336..e938d338 100644
--- a/src/hci/mucurses/edging.c
+++ b/src/hci/mucurses/edging.c
@@ -8,7 +8,7 @@
*
*/
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
/**
* Draw borders from single-byte characters and renditions around a
diff --git a/src/hci/mucurses/kb.c b/src/hci/mucurses/kb.c
index a8163ef7..8face14d 100644
--- a/src/hci/mucurses/kb.c
+++ b/src/hci/mucurses/kb.c
@@ -8,7 +8,7 @@
* MuCurses keyboard input handling functions
*/
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
#define INPUT_DELAY 200 // half-blocking delay timer resolution (ms)
#define INPUT_DELAY_TIMEOUT 1000 // half-blocking delay timeout
diff --git a/src/hci/mucurses/mucurses.c b/src/hci/mucurses/mucurses.c
index b67445ba..98a8a2c5 100644
--- a/src/hci/mucurses/mucurses.c
+++ b/src/hci/mucurses/mucurses.c
@@ -7,7 +7,7 @@
*
*/
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
static void _wupdcurs ( WINDOW *win ) __nonnull;
void _wputch ( WINDOW *win, chtype ch, int wrap ) __nonnull;
diff --git a/src/hci/mucurses/mucurses.h b/src/hci/mucurses/mucurses.h
index 7ac1086a..27039478 100644
--- a/src/hci/mucurses/mucurses.h
+++ b/src/hci/mucurses/mucurses.h
@@ -7,7 +7,7 @@
*
*/
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
#define WRAP 0
#define NOWRAP 1
diff --git a/src/hci/mucurses/print.c b/src/hci/mucurses/print.c
index 9c682588..e8831c58 100644
--- a/src/hci/mucurses/print.c
+++ b/src/hci/mucurses/print.c
@@ -10,7 +10,7 @@
*
*/
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
/**
* Add a single-byte character and rendition to a window and advance
diff --git a/src/hci/mucurses/print_nadv.c b/src/hci/mucurses/print_nadv.c
index 5caf7d4e..3a44e5bd 100644
--- a/src/hci/mucurses/print_nadv.c
+++ b/src/hci/mucurses/print_nadv.c
@@ -8,7 +8,7 @@
*
*/
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
/**
* Add string of single-byte characters and renditions to a window
diff --git a/src/hci/mucurses/slk.c b/src/hci/mucurses/slk.c
index 9c90acc3..660eb65c 100644
--- a/src/hci/mucurses/slk.c
+++ b/src/hci/mucurses/slk.c
@@ -11,7 +11,7 @@
* Soft label key functions
*/
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
#define MIN_SPACE_SIZE 2
diff --git a/src/hci/mucurses/winattrs.c b/src/hci/mucurses/winattrs.c
index f549d751..97a5a18b 100644
--- a/src/hci/mucurses/winattrs.c
+++ b/src/hci/mucurses/winattrs.c
@@ -6,7 +6,7 @@
*
*/
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
/**
* Get the background rendition attributes for a window
diff --git a/src/hci/mucurses/windows.c b/src/hci/mucurses/windows.c
index a24771c8..7f39bdea 100644
--- a/src/hci/mucurses/windows.c
+++ b/src/hci/mucurses/windows.c
@@ -9,7 +9,7 @@
*
*/
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
/**
* Delete a window
diff --git a/src/hci/mucurses/wininit.c b/src/hci/mucurses/wininit.c
index b75abba4..dd84d2f1 100644
--- a/src/hci/mucurses/wininit.c
+++ b/src/hci/mucurses/wininit.c
@@ -7,7 +7,7 @@
*
*/
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
/**
* Initialise console environment