Commit 25fe5dbc authored by Andreas Marek's avatar Andreas Marek

Merge branch 'master' into ELPA_GPU

parents 15b70b78 855b52e9
How to contribute to the ELPA library:
We are very happy and gratefull if you are willing to help us improve ELPA. Thus, we would like to make this process as simple as possible for you,
but at the same time still keep it manageable for us
For recommendations and suggestions, a simple email to us is sufficient!
If you would like to share with us your improvements, we suggest the following ways:
1. If you use a public accessible git repository, please send us a merge request. This is the preferred way
2. An email with a patch, will also be ok.
Thank you for supporting ELPA!
The ELPA development team
......@@ -12,8 +12,8 @@ set forth below.
The code is distributed under the terms of the GNU Lesser General Public
License version 3 (LGPL). The full text can be found in the file "lgpl.txt"
in this repository. "lgpl.txt" makes reference to the GPL v3, which can also
be found in this repository ("gpl.txt").
in this repository. "COPYING/lgpl.txt" makes reference to the GPL v3, which can also
be found in this repository ("COPING/gpl.txt").
****
ELPA reflects a substantial effort on the part of the original
......
This license can also be found in the sub-directory "COPYING"
Licensing and copyright terms for the ELPA library:
ELPA Consortium (2011)
****
Copyright of the original code rests with the authors inside the ELPA
consortium. The copyright of any additional modifications shall rest
with their original authors, but shall adhere to the licensing terms
set forth below.
****
The code is distributed under the terms of the GNU Lesser General Public
License version 3 (LGPL). The full text can be found in the file "lgpl.txt"
in this repository. "COPYING/lgpl.txt" makes reference to the GPL v3, which can also
be found in this repository ("COPYING/vi gpl.txt").
****
ELPA reflects a substantial effort on the part of the original
ELPA consortium, and we ask you to respect the spirit of the
license that we chose: i.e., please contribute any changes you
may have back to the original ELPA library distribution, and keep
any derivatives of ELPA under the same license that we chose for
the original distribution, the GNU Lesser General Public License.
When in doubt, talk to us. What we would like to ensure is that the ELPA
code can be used as needed, while providing a strong incentive for
others to contribute their modifications back to the original development.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment