X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=templates%2Fboot%2Faddons%2Fbsd4grml%2FLICENCE.TXT;h=8cd2df171d76b336599525fe6768c4504f3ce079;hb=d110625ce17ccd3804469d96a2640be26e641eef;hp=b54fa7d17a56c1695679f53baa3205a80bad3101;hpb=0474e40181e0e3066899a6865df56594483bd9dd;p=grml-live-grml.git diff --git a/templates/boot/addons/bsd4grml/LICENCE.TXT b/templates/boot/addons/bsd4grml/LICENCE.TXT index b54fa7d..8cd2df1 100644 --- a/templates/boot/addons/bsd4grml/LICENCE.TXT +++ b/templates/boot/addons/bsd4grml/LICENCE.TXT @@ -10,7 +10,7 @@ DESCRIPTION MIROS PROJECT MirOS is Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, - 2011, 2012 + 2011, 2012, 2013, 2014, 2015 The MirOS Project and its contributors. @@ -51,9 +51,11 @@ MirOS' origins and the (OpenBSD-derived) kernel and userland, as well as the MirOS Port- able Subprojects (for example, mksh, MirMake and jupp), but excluding single ports, the contributed sections (the modules gcc, x11 and contrib) - and any part of MirBSD with copyright assignments in place (appropriate - CVS access control ought to be set). Please note that this copyright - still applies to some work contained within the X11 and contrib modules. + and any part of MirBSD that is either marked as "Public Domain" and not + derived from another project's work under a good copyright licence, or + with copyright assignments in place, unless stated otherwise. Please note + that this copyright still applies to some work contained within the X11 + and contrib modules. MIDNIGHTBSD Some code has been derived from the compilation of software known as Mid- @@ -454,4 +456,4 @@ BUGS MirOS project at if you think you have discovered a bug. -MirOS January 14, 2012 6 +MirOS January 2, 2015 6