diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7b4177fa5..49e3d27c5 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 000000000..727f4cd6f --- /dev/null +++ b/CONTRIBUTORS @@ -0,0 +1,4 @@ +Aaron Bieber +Brandon Philips +James Patterson +Philippe Schommers diff --git a/LICENSE b/LICENSE index f94dde919..ac87dc7cb 100644 --- a/LICENSE +++ b/LICENSE @@ -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