diff options
| author | Jakob Borg <jakob@nym.se> | 2014-03-24 14:57:14 +0100 |
|---|---|---|
| committer | Jakob Borg <jakob@nym.se> | 2014-03-24 14:57:14 +0100 |
| commit | bcd3fd40e4158ec1aef982435729919c5c6e4472 (patch) | |
| tree | dd9e5ed0bf7fecd5a7c7193e0b9c95c49e23135c | |
| parent | d3d1a7999623773f0066f543a95af5a0226fa9cf (diff) | |
Add licensing and contribution info
| -rw-r--r-- | CONTRIBUTING.md | 10 | ||||
| -rw-r--r-- | CONTRIBUTORS | 4 | ||||
| -rw-r--r-- | LICENSE | 2 |
3 files changed, 15 insertions, 1 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7b4177fa58..49e3d27c5a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,5 +1,15 @@ Please do contribute! +## Licensing + +All contributions are made under the same MIT License as the rest of the +project, except documentation which is licensed under the Creative +Commons Attribution 4.0 International License. You retain the copyright +to code you have written. + +When accepting your first contribution, the maintainer of the project +will ensure that you are added to the CONTRIBUTORS file. + ## Building [See the wiki](https://github.com/calmh/syncthing/wiki/Building) diff --git a/CONTRIBUTORS b/CONTRIBUTORS new file mode 100644 index 0000000000..727f4cd6ff --- /dev/null +++ b/CONTRIBUTORS @@ -0,0 +1,4 @@ +Aaron Bieber <qbit@deftly.net> +Brandon Philips <brandon@ifup.org> +James Patterson <jamespatterson@operamail.com> +Philippe Schommers <philippe@schommers.be> @@ -1,4 +1,4 @@ -Copyright (C) 2013-2014 Jakob Borg +Copyright (C) 2014 Jakob Borg and other contributors (see the CONTRIBUTORS file). Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in |