summaryrefslogtreecommitdiff
path: root/LICENSE.txt
diff options
context:
space:
mode:
authorReinhard Tartler <siretart@tauware.de>2009-03-31 15:58:19 +0200
committerReinhard Tartler <siretart@tauware.de>2009-03-31 15:58:19 +0200
commit25db897553a0db0f912602b375029e724f51556e (patch)
tree613c8c23e22481e31a4d2f474e022ad87728da24 /LICENSE.txt
parent2787035d98661881477d696403ca2a78b49322d5 (diff)
Import upstream version 0.11~rc2+r2072
Diffstat (limited to 'LICENSE.txt')
-rw-r--r--LICENSE.txt18
1 files changed, 10 insertions, 8 deletions
diff --git a/LICENSE.txt b/LICENSE.txt
index a03851b8..d08aa509 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,6 +1,6 @@
-
-Copyright (c) 2003 - 2008
- Ben Summers and contributors. All rights reserved.
+Box Backup, http://www.fluffy.co.uk/boxbackup
+
+Copyright (c) 2003-2007 Ben Summers and contributors. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
@@ -8,12 +8,17 @@ are met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
+
2. 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.
+
3. All use of this software and associated advertising materials must
- display the following acknowledgment:
- This product includes software developed by Ben Summers.
+ display the following acknowledgement:
+
+ This product includes software developed by Ben Summers and
+ contributors.
+
4. The names of the Authors may not be used to endorse or promote
products derived from this software without specific prior written
permission.
@@ -33,6 +38,3 @@ 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.
-
-
-