summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Zapke-Gründemann <info@keimlink.de>2012-01-06 15:07:15 +0100
committerMarkus Zapke-Gründemann <info@keimlink.de>2012-01-06 15:07:15 +0100
commita1cae76c0fe6b36b0ace12f04eda516b8e02987e (patch)
tree9150c5a2718e13af957a7262268b461c9f7e889a
parent0dd0d9c44722f4d4b16fe5654c634b5ac2337f13 (diff)
Added New BSD License.
-rw-r--r--LICENSE25
-rw-r--r--README.rst6
2 files changed, 31 insertions, 0 deletions
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..86334db
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,25 @@
+Copyright (c) 2011-2012, Christian Franke and Markus Zapke-Gründemann
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ * Neither the names of Christian Franke and Markus Zapke-Gründemann nor
+ the names of its contributors may be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL Christian Franke OR Markus Zapke-Gründemann BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/README.rst b/README.rst
index 592a297..3080d44 100644
--- a/README.rst
+++ b/README.rst
@@ -69,6 +69,12 @@ To be able to see the tasks in the Django admin you need to start
(sublab_website)$ ./manage.py celerycam
+License
+=======
+
+This software is licensed under the New BSD License. See the LICENSE file in
+the top distribution directory for the full license text.
+
.. _Python: http://python.org/
.. _Git: http://git-scm.com/
.. _pip: http://www.pip-installer.org/