[Box Backup-commit] COMMIT r1749 - box/chris/merge

[boxbackup-dev at fluffy.co.uk]

Author: chris
Date: 2007-07-26 22:51:40 +0100 (Thu, 26 Jul 2007)
New Revision: 1749

Modified:
   box/chris/merge/LICENSE.txt
Log:
License update. (refs #3, merges [1654])


Modified: box/chris/merge/LICENSE.txt
===================================================================
--- box/chris/merge/LICENSE.txt	2007-07-26 21:45:38 UTC (rev 1748)
+++ box/chris/merge/LICENSE.txt	2007-07-26 21:51:40 UTC (rev 1749)
@@ -1,18 +1,24 @@
+Box Backup, http://www.fluffy.co.uk/boxbackup
+
+Copyright (c) 2003-2007 Ben Summers and contributors. All rights reserved.
  
-Copyright (c) 2003, 2005
-     Ben Summers.  All rights reserved.
- 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
 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 acknowledgement:
-       This product includes software developed by Ben Summers.
+
+	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.
@@ -32,6 +38,3 @@
 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.
- 
- 
- 
\ No newline at end of file