Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop-grove' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
warcomeb committed Feb 20, 2015
2 parents 5875546 + 0497044 commit 476c74b
Show file tree
Hide file tree
Showing 84 changed files with 89,527 additions and 2,084 deletions.
12 changes: 11 additions & 1 deletion CREDITS.md
@@ -1 +1,11 @@
Credits
Credits
=======

* Edoardo Bezzeccheri
* Marco Contigiani
* Marco Giammarini
* Nicola Orlandini
* Niccolò Paolinelli
* Alessio Paolucci
* Francesco Piunti

22 changes: 21 additions & 1 deletion LICENSE.md
@@ -1 +1,21 @@
License
The MIT License (MIT)

Copyright (c) 2012-2015 A. C. Open Hardware Ideas Lab

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in 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, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

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
AUTHORS 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 IN THE
SOFTWARE.
2 changes: 2 additions & 0 deletions README.md
@@ -0,0 +1,2 @@
LibOhiBoard
===========

0 comments on commit 476c74b

Please sign in to comment.