Merge branch 'master' into kaleid

This commit is contained in:
Adrien Bourmault 2019-01-14 14:42:34 +01:00 committed by GitHub
commit 2dfbe2cde7
2 changed files with 3 additions and 1 deletions

View File

@ -673,3 +673,5 @@ the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read Public License instead of this License. But first, please read
<https://www.gnu.org/licenses/why-not-lgpl.html>. <https://www.gnu.org/licenses/why-not-lgpl.html>.
=======

View File

@ -4,7 +4,7 @@ Fully open-source operating system from scratch (WIP), released under the GNU GP
Branch kaleid : Development focused on the Kaleid Kernel. Branch kaleid : Development focused on the Kaleid Kernel.
For changelog, see src/ChangeLog. For changelog, see ChangeLog.
For structure of the sources, see src/project-tree.txt. For structure of the sources, see src/project-tree.txt.