From d8c36c19b03f217dd4d51e6c0434ae20c6aa5d56 Mon Sep 17 00:00:00 2001 From: "Piotr S. Staszewski" Date: Mon, 20 Oct 2014 01:07:25 +0200 Subject: [PATCH 1/3] Include square.ttf with CDDA --- LICENSE.txt | 2 ++ data/font/square.ttf | Bin 0 -> 8532 bytes 2 files changed, 2 insertions(+) create mode 100644 data/font/square.ttf diff --git a/LICENSE.txt b/LICENSE.txt index 24d808cf2cacd..595f9eeb08ef7 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1 +1,3 @@ Cataclysm is licensed under the Creative Commons Attribution-ShareAlike 3.0 Unported License. To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/3.0/ or send a letter to Creative Commons, 444 Castro Street, Suite 900, Mountain View, California, 94041, USA. + +The Square font (data/font/square.ttf) is copyright Wouter van Oortmerssen, licensed under Creative Commons Attribution 3.0 Unported License. See http://strlen.com/square for more information. diff --git a/data/font/square.ttf b/data/font/square.ttf new file mode 100644 index 0000000000000000000000000000000000000000..d9509772d09a59e4626e469cc732eab8e7a2bfc9 GIT binary patch literal 8532 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 Wejnm)0P~&)Z!e=VdH^!LM)W`403r7P literal 0 HcmV?d00001 From 8c237ad50a3994d75d252839f37a91e65bc16027 Mon Sep 17 00:00:00 2001 From: "Piotr S. Staszewski" Date: Mon, 20 Oct 2014 01:53:19 +0200 Subject: [PATCH 2/3] License signoff --- SIGNOFF | 1 + 1 file changed, 1 insertion(+) diff --git a/SIGNOFF b/SIGNOFF index a80b58951493a..2c89a26f922ec 100644 --- a/SIGNOFF +++ b/SIGNOFF @@ -44,3 +44,4 @@ TranquilMarmot (Nate Moore) Stéphane Travostino Jeremy Osborne David "Davek" Keaton +Piotr S. Staszewski (drbig) From e3cbce5b73104d3e249af37ad9045edcc761a28c Mon Sep 17 00:00:00 2001 From: desrik Date: Mon, 20 Oct 2014 00:35:56 -0400 Subject: [PATCH 3/3] Add section for GitEye, a linux graphical git client, to [.gitignore] --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index dc8702792931e..e071a0f7d569e 100644 --- a/.gitignore +++ b/.gitignore @@ -77,3 +77,6 @@ nbproject/ # taskwarrior files *.task* + +# GitEye files +*.project