Commit cbb5c944 authored by Ille, Ondrej, Ing.'s avatar Ille, Ondrej, Ing.

Change email of Martin Jerabek.

Removed whitespaces in license files.
parent 9d8c100b
......@@ -4,7 +4,7 @@ Copyright (C) 2015-2018
Authors:
Ondrej Ille <ondrej.ille@gmail.com>
Martin Jerabek <jerabma7@fel.cvut.cz>
Martin Jerabek <martin.jerabek01@gmail.com>
Project advisors:
Jiri Novak <jnovak@fel.cvut.cz>
......@@ -14,25 +14,25 @@ Department of Measurement (http://meas.fel.cvut.cz/)
Faculty of Electrical Engineering (http://www.fel.cvut.cz)
Czech Technical University (http://www.cvut.cz/)
Permission is hereby granted, free of charge, to any person obtaining a copy
of this VHDL component and associated documentation files (the "Component"),
to deal in the Component without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Component, and to permit persons to whom the
Permission is hereby granted, free of charge, to any person obtaining a copy
of this VHDL component and associated documentation files (the "Component"),
to deal in the Component without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Component, and to permit persons to whom the
Component is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Component.
THE COMPONENT 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
AUTHORS OR COPYRIGHTHOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
THE COMPONENT 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
AUTHORS OR COPYRIGHTHOLDERS 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 COMPONENT OR THE USE OR OTHER DEALINGS
FROM, OUT OF OR IN CONNECTION WITH THE COMPONENT OR THE USE OR OTHER DEALINGS
IN THE COMPONENT.
The CAN protocol is developed by Robert Bosch GmbH and protected by patents.
Anybody who wants to implement this IP core on silicon has to obtain a CAN
The CAN protocol is developed by Robert Bosch GmbH and protected by patents.
Anybody who wants to implement this IP core on silicon has to obtain a CAN
protocol license from Bosch.
......@@ -4,7 +4,7 @@ Copyright (C) 2015-2018
Authors:
Ondrej Ille <ondrej.ille@gmail.com>
Martin Jerabek <jerabma7@fel.cvut.cz>
Martin Jerabek <martin.jerabek01@gmail.com>
Project advisors:
Jiri Novak <jnovak@fel.cvut.cz>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment