misaka: final merge prep
This commit is contained in:
parent
b35f7ac8c9
commit
08a1b3d0a9
2
.gitmodules
vendored
2
.gitmodules
vendored
@ -1,6 +1,6 @@
|
||||
[submodule "util/binutils-gdb"]
|
||||
path = util/binutils-gdb
|
||||
url = ../../toaruos/binutils-gdb.git
|
||||
url = ../../toaruos/binutils-gdb
|
||||
[submodule "util/gcc"]
|
||||
path = util/gcc
|
||||
url = ../../toaruos/gcc
|
||||
|
36
LICENSE
36
LICENSE
@ -1,33 +1,33 @@
|
||||
|
||||
University of Illinois/NCSA Open Source License
|
||||
University of Illinois/NCSA Open Source License
|
||||
|
||||
Copyright (c) 2011-2019 K Lange, et al. (hereafter [fullname]). All rights reserved.
|
||||
Copyright (c) 2011-2021 K Lange, et al. (hereafter [fullname]). All rights reserved.
|
||||
|
||||
Developed by: ToaruOS (hereafter [project])
|
||||
|
||||
Permission is hereby granted, free of charge, to any person
|
||||
obtaining a copy of this software and associated documentation files
|
||||
(the "Software"), to deal with the Software without restriction,
|
||||
|
||||
Permission is hereby granted, free of charge, to any person
|
||||
obtaining a copy of this software and associated documentation files
|
||||
(the "Software"), to deal with the Software without restriction,
|
||||
including without limitation the rights to use, copy, modify, merge,
|
||||
publish, distribute, sublicense, and/or sell copies of the Software,
|
||||
and to permit persons to whom the Software is furnished to do so,
|
||||
publish, distribute, sublicense, and/or sell copies of the Software,
|
||||
and to permit persons to whom the Software is furnished to do so,
|
||||
subject to the following conditions:
|
||||
|
||||
* Redistributions of source code must retain the above copyright notice,
|
||||
* Redistributions of source code must retain the above copyright notice,
|
||||
this list of conditions and the following disclaimers.
|
||||
|
||||
* Redistributions in binary form must reproduce the above copyright
|
||||
notice, this list of conditions and the following disclaimers in the
|
||||
* Redistributions in binary form must reproduce the above copyright
|
||||
notice, this list of conditions and the following disclaimers in the
|
||||
documentation and/or other materials provided with the distribution.
|
||||
|
||||
* Neither the names of [fullname], [project] nor the names of its
|
||||
* Neither the names of [fullname], [project] nor the names of its
|
||||
contributors may be used to endorse or promote products derived from
|
||||
this Software without specific prior written permission.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
||||
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
||||
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH
|
||||
THE SOFTWARE.
|
||||
|
1
util/binutils-gdb
Submodule
1
util/binutils-gdb
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit 38d769c5da44843ea18ef15d8d62af9380f26aea
|
1
util/gcc
Submodule
1
util/gcc
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit 29d232ff766aae6a54ecad24b5eae287eccf5c50
|
Loading…
Reference in New Issue
Block a user