convert the txt files explicitly to DOS format, and make them "binary" in .gitattributes

[xonotic/xonotic.git] / Docs / egyptsoc / permission.txt

diff --git a/Docs/egyptsoc/permission.txt b/Docs/egyptsoc/permission.txt
index 324729d1e6584f30d56e92484b0621836b9c203b..52666e6ffc68be2ea505033d8e5ad3699400016a 100644 (file)
--- a/Docs/egyptsoc/permission.txt
+++ b/Docs/egyptsoc/permission.txt
@@ -1,11 +1,11 @@
-Hello, 
-
-greetings from a conference in greece. I just got permission from Simon O'Callaghan to distribute the textures from http://www.simonoc.com/pages/materials/tpegypt/index.htm under the terms of the GPL with future versions of Nexuiz, provided classical attribution is given and that the game documentation includes a link to http://www.simonoc.com/pages/materials.htm so artists can find his stuff. 
-
-Thanks alot Simon! 
-
-This is good news, as some Nexuiz community maps use these textures, albeit as of yet licensed under a GPL-incompatible Creative Commons license. 
-
-Does anybody feel like creating bumpmaps/normalmaps and glossmaps for that set of textures?
-
--- SavageX
+Hello, \r
+\r
+greetings from a conference in greece. I just got permission from Simon O'Callaghan to distribute the textures from http://www.simonoc.com/pages/materials/tpegypt/index.htm under the terms of the GPL with future versions of Nexuiz, provided classical attribution is given and that the game documentation includes a link to http://www.simonoc.com/pages/materials.htm so artists can find his stuff. \r
+\r
+Thanks alot Simon! \r
+\r
+This is good news, as some Nexuiz community maps use these textures, albeit as of yet licensed under a GPL-incompatible Creative Commons license. \r
+\r
+Does anybody feel like creating bumpmaps/normalmaps and glossmaps for that set of textures?\r
+\r
+-- SavageX\r