diff --git a/README.md b/README.md index 809aabaf894e29dc3dbebfb810924c266c261871..be879cb56259d9cb7d642abedbdb2357874645c4 100644 --- a/README.md +++ b/README.md @@ -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) --- -These documents are free software; you can redistribute them and/or -modify them under the terms and conditions of the following licenses: -- \*.tex, \*.pdf: documentation and slides +These documents are free software; you can redistribute them and/or modify them +under the terms and conditions of the following licenses, unless otherwise noted: +- \*.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, - or the Creative Commons Attribution-ShareAlike 3.0 Unported License diff --git a/common/README.md b/common/README.md index da407928c105968f18e102b3a6f102dd2d95c9d8..7a915937618e53b4e91d141c68aa13a9cff772dc 100755 --- a/common/README.md +++ b/common/README.md @@ -1,16 +1,16 @@ -Student Repositiory for Embedded Systems and Applied Computer Sciences ----------------------------------------------------------------------- -Copyright (C) 2016, 2017 Lukas Friedrichsen & Philipp Stenkamp +Student Repositiory for Applied Computer Sciences, Embedded Systems and Systems Engineering +------------------------------------------------------------------------------------------- +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 --- -These documents are free software; you can redistribute them and/or -modify them under the terms and conditions of the following licenses: -- \*.tex, \*.pdf: documentation and slides +These documents are free software; you can redistribute them and/or modify them +under the terms and conditions of the following licenses, unless otherwise noted: +- \*.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, - 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, - or the Creative Commons Attribution-ShareAlike 3.0 Unported License @@ -19,9 +19,9 @@ 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](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/. diff --git a/common/README.txt b/common/README.txt deleted file mode 100755 index 2715f42e70ac144007711517ebab9df287748e1c..0000000000000000000000000000000000000000 --- a/common/README.txt +++ /dev/null @@ -1,35 +0,0 @@ -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/>. diff --git a/common/photos/LICENSE.md b/common/photos/LICENSE.md new file mode 100644 index 0000000000000000000000000000000000000000..2b2ac628e493b44efc623ed0aacb07ffac68bd89 --- /dev/null +++ b/common/photos/LICENSE.md @@ -0,0 +1,5 @@ +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