You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by dw...@apache.org on 2013/03/04 11:59:50 UTC

svn commit: r1452250 - in /lucene/dev/branches/branch_4x/solr/licenses: carrot2-mini-LICENSE-BSD_LIKE.txt carrot2-mini-NOTICE.txt

Author: dweiss
Date: Mon Mar  4 10:59:50 2013
New Revision: 1452250

URL: http://svn.apache.org/r1452250
Log:
Propset.

Modified:
    lucene/dev/branches/branch_4x/solr/licenses/carrot2-mini-LICENSE-BSD_LIKE.txt   (contents, props changed)
    lucene/dev/branches/branch_4x/solr/licenses/carrot2-mini-NOTICE.txt   (contents, props changed)

Modified: lucene/dev/branches/branch_4x/solr/licenses/carrot2-mini-LICENSE-BSD_LIKE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/licenses/carrot2-mini-LICENSE-BSD_LIKE.txt?rev=1452250&r1=1452249&r2=1452250&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/licenses/carrot2-mini-LICENSE-BSD_LIKE.txt (original)
+++ lucene/dev/branches/branch_4x/solr/licenses/carrot2-mini-LICENSE-BSD_LIKE.txt Mon Mar  4 10:59:50 2013
@@ -1,36 +1,36 @@
-
-Carrot2 Project
-
-Copyright (C) 2002-2013, Dawid Weiss, Stanisław Osiński.
-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 name  of the Carrot2 Project  nor  the names  of  its contributors 
-  may  be used  to endorse  or  promote  products derived   from  this  software 
-  without specific prior written permission.
-
-- We kindly request that you include in the end-user documentation provided with
-  the redistribution and/or in the software itself an acknowledgement equivalent 
-  to  the  following:  "This product includes  software developed by the Carrot2 
-  Project."
-
-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.
-
+
+Carrot2 Project
+
+Copyright (C) 2002-2013, Dawid Weiss, Stanisław Osiński.
+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 name  of the Carrot2 Project  nor  the names  of  its contributors 
+  may  be used  to endorse  or  promote  products derived   from  this  software 
+  without specific prior written permission.
+
+- We kindly request that you include in the end-user documentation provided with
+  the redistribution and/or in the software itself an acknowledgement equivalent 
+  to  the  following:  "This product includes  software developed by the Carrot2 
+  Project."
+
+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.
+

Modified: lucene/dev/branches/branch_4x/solr/licenses/carrot2-mini-NOTICE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/licenses/carrot2-mini-NOTICE.txt?rev=1452250&r1=1452249&r2=1452250&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/licenses/carrot2-mini-NOTICE.txt (original)
+++ lucene/dev/branches/branch_4x/solr/licenses/carrot2-mini-NOTICE.txt Mon Mar  4 10:59:50 2013
@@ -1,10 +1,10 @@
-=========================================================================
-==     Carrot2 Notice                                                  ==
-=========================================================================
-Copyright (C) 2002-2013, Dawid Weiss, Stanislaw Osinski.
-Portions (C) Contributors listed in "carrot2.CONTRIBUTORS" file.
-All rights reserved.
-
-This product includes software developed by the Carrot2 Project.
-
-See http://project.carrot2.org/
+=========================================================================
+==     Carrot2 Notice                                                  ==
+=========================================================================
+Copyright (C) 2002-2013, Dawid Weiss, Stanislaw Osinski.
+Portions (C) Contributors listed in "carrot2.CONTRIBUTORS" file.
+All rights reserved.
+
+This product includes software developed by the Carrot2 Project.
+
+See http://project.carrot2.org/