Merge remote-tracking branches 'dda/pr/9615', 'dda/pr/9617' and 'dda/…

…pr/9619' into dda-master * dda/pr/9615: Include square.ttf with CDDA * dda/pr/9617: License signoff * dda/pr/9619: Add section for GitEye, a linux graphical git client, to [.gitignore]
ZhilkinSerg · Oct 20, 2014 · 989bcc3 · 989bcc3
4 parents 709b7a7 + d8c36c1 + 8c237ad + e3cbce5
commit 989bcc3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -77,3 +77,6 @@ nbproject/
 
 # taskwarrior files
 *.task*
+
+# GitEye files
+*.project
diff --git 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/SIGNOFF b/SIGNOFF
@@ -44,3 +44,4 @@ TranquilMarmot (Nate Moore) <nate272@gmail.com>
 Stéphane Travostino <stephane.travostino@gmail.com>
 Jeremy Osborne <jeremywosborne@gmail.com>
 David "Davek" Keaton <keaton.david@gmail.com>
+Piotr S. Staszewski (drbig) <p.staszewski@gmail.com>
diff --git a/data/font/square.ttf b/data/font/square.ttf
Original file line number	Diff line number	Diff line change
		@@ -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.