Skip to content

Commit

Permalink
Merge branch 'licence-font'
Browse files Browse the repository at this point in the history
  • Loading branch information
padawin committed May 15, 2017
2 parents 5ad26c1 + 38d8598 commit 3370d1e
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 2 deletions.
21 changes: 21 additions & 0 deletions LICENCE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2017 Ghislain Rodrigues

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: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
NAME := floodit
TARGET := $(NAME)
TARGETDIST := $(NAME).opk
DISTFILES := $(TARGET) ClearSans-Medium.ttf resources
DISTFILES := $(TARGET) ClearSans-Medium.ttf LICENCE.md README.md resources
OBJS := *.c
OPTS := -g -O2 -Wall
LIB := -lSDL2 -lSDL2_ttf -lSDL2_net -lSDL2_image
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@ To start the game, run the executable ```floodit```.
## Credits

Font ClearSans from
https://01.org/clear-sans/blogs/2013/clear-sans-new-font-optimized-small-screen-readability
https://01.org/clear-sans/blogs/2013/clear-sans-new-font-optimized-small-screen-readability licenced under [Apache License v2.00](https://www.fontsquirrel.com/license/clear-sans)

0 comments on commit 3370d1e

Please sign in to comment.