Skip to content
Snippets Groups Projects
Commit cce26cd2 authored by Lukas Friedrichsen's avatar Lukas Friedrichsen
Browse files

Merge branch 'master' of https://gitlab.cvh-server.de/lf.ps/vbls

parents 3578bb22 b8dab762
Branches
No related tags found
No related merge requests found
...@@ -18,9 +18,9 @@ Current projects include: ...@@ -18,9 +18,9 @@ Current projects include:
[<img src="https://i.creativecommons.org/l/by-sa/4.0/80x15.png" alt="Image Licensed under CC-BY-SA" align="right">](/common/CC-BY-SA-3.0.txt) [<img src="https://i.creativecommons.org/l/by-sa/4.0/80x15.png" alt="Image Licensed under CC-BY-SA" align="right">](/common/CC-BY-SA-3.0.txt)
--- ---
These documents are free software; you can redistribute them and/or These documents are free software; you can redistribute them and/or modify them
modify them under the terms and conditions of the following licenses: under the terms and conditions of the following licenses, unless otherwise noted:
- \*.tex, \*.pdf: documentation and slides - \*.tex, \*.pdf, \*.jpg, \*.png, \*.svg: documentation, presentation slides and original images.
- either the GNU General Public License, version 3 or, at your option, any later version, - either the GNU General Public License, version 3 or, at your option, any later version,
- or the Creative Commons Attribution-ShareAlike 3.0 Unported License - or the Creative Commons Attribution-ShareAlike 3.0 Unported License
......
Student Repositiory for Embedded Systems and Applied Computer Sciences Student Repositiory for Applied Computer Sciences, Embedded Systems and Systems Engineering
---------------------------------------------------------------------- -------------------------------------------------------------------------------------------
Copyright (C) 2016, 2017 Lukas Friedrichsen & Philipp Stenkamp Copyright © 2016, 2017 Lukas Friedrichsen & Philipp Stenkamp
{ [lukas.friedrichsen](mailto:lukas.friedrichsen@hs-bochum.de), [philipp.stenkamp](mailto:philipp.stenkamp@hs-bochum.de) }@hs-bochum.de { [lukas.friedrichsen](mailto:lukas.friedrichsen@hs-bochum.de), [philipp.stenkamp](mailto:philipp.stenkamp@hs-bochum.de) }@hs-bochum.de
--- ---
These documents are free software; you can redistribute them and/or These documents are free software; you can redistribute them and/or modify them
modify them under the terms and conditions of the following licenses: under the terms and conditions of the following licenses, unless otherwise noted:
- \*.tex, \*.pdf: documentation and slides - \*.tex, \*.pdf, \*.jpg, \*.png, \*.svg: documentation, presentation slides and original images.
- either the GNU General Public License, version 3 or, at your option, any later version, - either the GNU General Public License, version 3 or, at your option, any later version,
- or the Creative Commons Attribution-ShareAlike 3.0 Unported License - or the Creative Commons Attribution-ShareAlike 3.0 Unported License
- \*.c, \*.cpp, \*.h, Makefile*: programmes - \*.java, \*.c, \*.cpp, \*.h, Makefile*: programmes
- either the Modified BSD License, - either the Modified BSD License,
- or the Creative Commons Attribution-ShareAlike 3.0 Unported License - or the Creative Commons Attribution-ShareAlike 3.0 Unported License
...@@ -19,9 +19,9 @@ useful, but WITHOUT ANY WARRANTY; without even the implied warranty ...@@ -19,9 +19,9 @@ useful, but WITHOUT ANY WARRANTY; without even the implied warranty
of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
licenses for more details. licenses for more details.
You should have received a [copy](https://gitlab.cvh-server.de/lf.ps/vbls/blob/master/common/GNU-GPL-3.txt) of the GNU General Public License along with this program; see the file GNU-GPL-3. If not, see <http://www.gnu.org/licenses/>. You should have received a [copy](/common/GNU-GPL-3.txt) of the GNU General Public License along with this program; see the file GNU-GPL-3. If not, see <http://www.gnu.org/licenses/>.
You should have received a [copy](https://gitlab.cvh-server.de/lf.ps/vbls/blob/master/common/BSD-MODIFIED.txt) of the Modified BSD License along with this document; see the file BSD-MODIFIED. If not, see http://www.xfree86.org/3.3.6/COPYRIGHT2.html#5. You should have received a [copy](/common/BSD-MODIFIED.txt) of the Modified BSD License along with this document; see the file BSD-MODIFIED. If not, see http://www.xfree86.org/3.3.6/COPYRIGHT2.html#5.
You should have received a [copy](https://gitlab.cvh-server.de/lf.ps/vbls/blob/master/common/CC-BY-SA-3.0.txt) of the Creative Commons Attribution-ShareAlike 3.0 Unported License along with this document; see the file CC-BY-SA-3.0. If not, see You should have received a [copy](/common/CC-BY-SA-3.0.txt) of the Creative Commons Attribution-ShareAlike 3.0 Unported License along with this document; see the file CC-BY-SA-3.0. If not, see
http://creativecommons.org/licenses/. http://creativecommons.org/licenses/.
Student Repositiory for Embedded Systems and Applied Computer Sciences
Copyright (C) 2016, 2017 Lukas Friedrichsen & Philipp Stenkamp
mailto:{philipp.stenkamp, lukas.friedrichsen}@hs-bochum.de
These documents are free software; you can redistribute them and/or
modify them under the terms and conditions of the following licenses:
*.tex: dochumentation and slides
- either the GNU General Public License, version 3
or, at your option, any later version,
- or the Creative Commons Attribution-ShareAlike 3.0
Unported License
*.c, *.cpp, *.h, Makefile*: programmes
- either the Modified BSD License,
- or the Creative Commons Attribution-ShareAlike 3.0
Unported License
These documents are distributed in the hope that they will be
useful, but WITHOUT ANY WARRANTY; without even the implied warranty
of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
licenses for more details.
You should have received a copy of the GNU General Public License
along with this program; see the file GNU-GPL-3. If not, see
<http://www.gnu.org/licenses/>.
You should have received a copy of the Modified BSD License
along with this document; see the file BSD-MODIFIED. If not,
see <http://www.xfree86.org/3.3.6/COPYRIGHT2.html#5>.
You should have received a copy of the Creative Commons
Attribution-ShareAlike 3.0 Unported License along with
this document; see the file CC-BY-SA-3.0. If not, see
<http://creativecommons.org/licenses/>.
Copyright (C) 2017 Philipp Stenkamp
These images are licensed under the Creative Commons Attribution-ShareAlike 3.0 Unported License.
You should have received a copy of this license along with this document; see the file CC-BY-SA-3.0. If not, see http://creativecommons.org/licenses/.
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment