svn commit: r1714033 - /subversion/branches/move-tracking-2/LICENSE

[ju...@apache.org]

Author: julianfoad
Date: Thu Nov 12 12:50:09 2015
New Revision: 1714033

URL: http://svn.apache.org/viewvc?rev=1714033&view=rev
Log:
On the 'move-tracking-2' branch: Update our 'LICENSE' file to include the
licence of 'linenoise'.

* LICENSE:
  Add the 'linenoise' licence text.

Modified:
    subversion/branches/move-tracking-2/LICENSE

Modified: subversion/branches/move-tracking-2/LICENSE
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/LICENSE?rev=1714033&r1=1714032&r2=1714033&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/LICENSE (original)
+++ subversion/branches/move-tracking-2/LICENSE Thu Nov 12 12:50:09 2015
@@ -366,3 +366,32 @@ subversion/libsvn_subr/x509.h
  *  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.
+
+For the (modified) 'linenoise' library in subversion/svnmover/linenoise
+
+  Copyright (c) 2010-2014, Salvatore Sanfilippo <antirez at gmail dot com>
+  Copyright (c) 2010-2013, Pieter Noordhuis <pcnoordhuis at gmail dot com>
+
+  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.
+
+  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 THE COPYRIGHT
+  OWNER OR CONTRIBUTORS 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.