diff options
author | mboelen <michael@cisofy.com> | 2014-08-26 19:46:33 +0400 |
---|---|---|
committer | mboelen <michael@cisofy.com> | 2014-08-26 19:46:33 +0400 |
commit | 9ac498cc7b26c96c5de25cf3a07c89094e018e28 (patch) | |
tree | 906215e332466ac61ed620350a2b9be493211b5d /LICENSE | |
parent | c0ae2e217b7f1fb0171017ce5afb8eb8898470db (diff) | |
parent | 02e66e323f58f34faafc43710f9d60e90f16c0fe (diff) |
Import of LICENSE and README.md
Diffstat (limited to 'LICENSE')
-rw-r--r-- | LICENSE | 13 |
1 files changed, 13 insertions, 0 deletions
@@ -1,4 +1,8 @@ +<<<<<<< HEAD GNU GENERAL PUBLIC LICENSE +======= +GNU GENERAL PUBLIC LICENSE +>>>>>>> 02e66e323f58f34faafc43710f9d60e90f16c0fe Version 3, 29 June 2007 Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> @@ -631,8 +635,13 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. +<<<<<<< HEAD <one line to give the program's name and a brief idea of what it does.> Copyright (C) <year> <name of author> +======= + {one line to give the program's name and a brief idea of what it does.} + Copyright (C) {year} {name of author} +>>>>>>> 02e66e323f58f34faafc43710f9d60e90f16c0fe This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +661,11 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: +<<<<<<< HEAD <program> Copyright (C) <year> <name of author> +======= + {project} Copyright (C) {year} {fullname} +>>>>>>> 02e66e323f58f34faafc43710f9d60e90f16c0fe This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. |