Changeset 12994 in project


Ignore:
Timestamp:
01/12/09 00:40:56 (11 years ago)
Author:
sjamaan
Message:

Merge fix in license section for wiki syntax

File:
1 edited

Legend:

Unmodified
Added
Removed
  • wiki/uri-generic

    r12926 r12994  
    187187URI library]] by Graham Klyne <gk@ninebynine.org>.
    188188
    189 Copyright 2008 Ivan Raikov, Peter Bex.
    190 
    191 Redistribution and use in source and binary forms, with or without
    192 modification, are permitted provided that the following conditions are
    193 met:
    194 
    195 - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
    196 
    197 - 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.
    198 
    199 - Neither name of the copyright holders nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
    200 
    201 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND THE 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 HOLDERS OR THE 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.
    202 
     189
     190  Copyright 2008 Ivan Raikov, Peter Bex.
     191  All rights reserved.
     192 
     193  Redistribution and use in source and binary forms, with or without
     194  modification, are permitted provided that the following conditions are
     195  met:
     196 
     197  Redistributions of source code must retain the above copyright
     198  notice, this list of conditions and the following disclaimer.
     199 
     200  Redistributions in binary form must reproduce the above copyright
     201  notice, this list of conditions and the following disclaimer in the
     202  documentation and/or other materials provided with the distribution.
     203 
     204  Neither the name of the author nor the names of its contributors may
     205  be used to endorse or promote products derived from this software
     206  without specific prior written permission.
     207 
     208  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
     209  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
     210  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
     211  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
     212  COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
     213  INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
     214  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
     215  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
     216  HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
     217  STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
     218  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
     219  OF THE POSSIBILITY OF SUCH DAMAGE.
Note: See TracChangeset for help on using the changeset viewer.