summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSander Vrijders <sander.vrijders@intec.ugent.be>2016-02-12 10:40:42 +0100
committerSander Vrijders <sander.vrijders@intec.ugent.be>2016-02-12 10:40:42 +0100
commit4944a01444f146fdfb1a45ed346b5bc4744c0a45 (patch)
tree02afd775f10cd0b67ec4e5f196adb0817207ae66
parent3add87d6f80c123a34e6f3263ce4427d79a7f257 (diff)
parentb65d57430c77eb48e49ac20f0801289de67ebfe2 (diff)
downloadouroboros-4944a01444f146fdfb1a45ed346b5bc4744c0a45.tar.gz
ouroboros-4944a01444f146fdfb1a45ed346b5bc4744c0a45.zip
Merged in dstaesse/ouroboros/be (pull request #1)
Added CONTRIBUTORS file
-rw-r--r--CONTRIBUTORS5
-rw-r--r--LICENSE59
2 files changed, 5 insertions, 59 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
new file mode 100644
index 00000000..eeff71ad
--- /dev/null
+++ b/CONTRIBUTORS
@@ -0,0 +1,5 @@
+This file contains a list of people who have made large contributions to
+Ouroboros, in alphabetical order.
+
+Dimitri Staessens <dimitri.staessens@intec.ugent.be>
+Sander Vrijders <sander.vrijders@intec.ugent.be>
diff --git a/LICENSE b/LICENSE
index d511905c..e37680cf 100644
--- a/LICENSE
+++ b/LICENSE
@@ -278,62 +278,3 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- 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
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision 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.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.