Changeset 1065dd4 for COPYING


Ignore:
Timestamp:
2015-01-17T20:00:49Z (10 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
eb4ad8d
Parents:
bc7a0d4 (diff), 6b13103 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge cleanup changes. (FSF address fix, and using GLib variants of some
functions which cleans up compiler warnings.)

File:
1 edited

Legend:

Unmodified
Added
Removed

  • COPYING

    rbc7a0d4 r1065dd4  
    1                     GNU GENERAL PUBLIC LICENSE
    2                        Version 2, June 1991
    3 
    4  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
    5      59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
     1                    GNU GENERAL PUBLIC LICENSE
     2                       Version 2, June 1991
     3
     4 Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
     5 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
    66 Everyone is permitted to copy and distribute verbatim copies
    77 of this license document, but changing it is not allowed.
    88
    9                             Preamble
     9                            Preamble
    1010
    1111  The licenses for most software are designed to take away your
    … …  
    1616Foundation's software and to any other program whose authors commit to
    1717using it.  (Some other Free Software Foundation software is covered by
    18 the GNU Library General Public License instead.)  You can apply it to
     18the GNU Lesser General Public License instead.)  You can apply it to
    1919your programs, too.
    2020
    … …  
    5757modification follow.
    5858
    59 
    60                     GNU GENERAL PUBLIC LICENSE
     59                    GNU GENERAL PUBLIC LICENSE
    6160   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
    6261
    … …  
    113112    the Program is not required to print an announcement.)
    114113
    115 
    116114These requirements apply to the modified work as a whole.  If
    117115identifiable sections of that work are not derived from the Program,
    … …  
    171169distribution of the source code, even though third parties are not
    172170compelled to copy the source along with the object code.
    173 
    174171
    175172  4. You may not copy, modify, sublicense, or distribute the Program
    … …  
    230227be a consequence of the rest of this License.
    231228
    232 
    233229  8. If the distribution and/or use of the Program is restricted in
    234230certain countries either by patents or by copyrighted interfaces, the
    … …  
    260256of promoting the sharing and reuse of software generally.
    261257
    262                             NO WARRANTY
     258                            NO WARRANTY
    263259
    264260  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
    … …  
    282278POSSIBILITY OF SUCH DAMAGES.
    283279
    284                      END OF TERMS AND CONDITIONS
    285 
    286 
    287             How to Apply These Terms to Your New Programs
     280                     END OF TERMS AND CONDITIONS
     281
     282            How to Apply These Terms to Your New Programs
    288283
    289284  If you develop a new program, and you want it to be of the greatest
    … …  
    309304    GNU General Public License for more details.
    310305
    311     You should have received a copy of the GNU General Public License
    312     along with this program; if not, write to the Free Software
    313     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
    314 
     306    You should have received a copy of the GNU General Public License along
     307    with this program; if not, write to the Free Software Foundation, Inc.,
     308    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
    315309
    316310Also add information on how to contact you by electronic and paper mail.
    … …  
    319313when it starts in an interactive mode:
    320314
    321     Gnomovision version 69, Copyright (C) year  name of author
     315    Gnomovision version 69, Copyright (C) year name of author
    322316    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
    323317    This is free software, and you are welcome to redistribute it
    … …  
    342336proprietary programs.  If your program is a subroutine library, you may
    343337consider it more useful to permit linking proprietary applications with the
    344 library.  If this is what you want to do, use the GNU Library General
     338library.  If this is what you want to do, use the GNU Lesser General
    345339Public License instead of this License.
Note: See TracChangeset for help on using the changeset viewer.