gwj / at91sam9263 · Commits

Commit a013cc65933eb4ba51f58883cae5e362fd56ab46

Authored by aurel32
1 parent bad5b1ec

COPYING: update from FSF 

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5468 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 9 additions and 9 deletions
1 GNU GENERAL PUBLIC LICENSE 1 GNU GENERAL PUBLIC LICENSE
2 Version 2, June 1991 2 Version 2, June 1991
3 3
4 - Copyright (C) 1989, 1991 Free Software Foundation, Inc.  
5 - 675 Mass Ave, Cambridge, MA 02139, USA 4 + Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
  5 + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
6 Everyone is permitted to copy and distribute verbatim copies 6 Everyone is permitted to copy and distribute verbatim copies
7 of this license document, but changing it is not allowed. 7 of this license document, but changing it is not allowed.
8 8
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This @@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This
15 General Public License applies to most of the Free Software 15 General Public License applies to most of the Free Software
16 Foundation's software and to any other program whose authors commit to 16 Foundation's software and to any other program whose authors commit to
17 using it. (Some other Free Software Foundation software is covered by 17 using it. (Some other Free Software Foundation software is covered by
18 -the GNU Library General Public License instead.) You can apply it to 18 +the GNU Lesser General Public License instead.) You can apply it to
19 your programs, too. 19 your programs, too.
20 20
21 When we speak of free software, we are referring to freedom, not 21 When we speak of free software, we are referring to freedom, not
@@ -291,7 +291,7 @@ convey the exclusion of warranty; and each file should have at least @@ -291,7 +291,7 @@ convey the exclusion of warranty; and each file should have at least
291 the "copyright" line and a pointer to where the full notice is found. 291 the "copyright" line and a pointer to where the full notice is found.
292 292
293 <one line to give the program's name and a brief idea of what it does.> 293 <one line to give the program's name and a brief idea of what it does.>
294 - Copyright (C) 19yy <name of author> 294 + Copyright (C) <year> <name of author>
295 295
296 This program is free software; you can redistribute it and/or modify 296 This program is free software; you can redistribute it and/or modify
297 it under the terms of the GNU General Public License as published by 297 it under the terms of the GNU General Public License as published by
@@ -303,16 +303,16 @@ the &quot;copyright&quot; line and a pointer to where the full notice is found. @@ -303,16 +303,16 @@ the &quot;copyright&quot; line and a pointer to where the full notice is found.
303 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 303 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
304 GNU General Public License for more details. 304 GNU General Public License for more details.
305 305
306 - You should have received a copy of the GNU General Public License  
307 - along with this program; if not, write to the Free Software  
308 - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 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.
309 309
310 Also add information on how to contact you by electronic and paper mail. 310 Also add information on how to contact you by electronic and paper mail.
311 311
312 If the program is interactive, make it output a short notice like this 312 If the program is interactive, make it output a short notice like this
313 when it starts in an interactive mode: 313 when it starts in an interactive mode:
314 314
315 - Gnomovision version 69, Copyright (C) 19yy name of author 315 + Gnomovision version 69, Copyright (C) year name of author
316 Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. 316 Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
317 This is free software, and you are welcome to redistribute it 317 This is free software, and you are welcome to redistribute it
318 under certain conditions; type `show c' for details. 318 under certain conditions; type `show c' for details.
@@ -335,5 +335,5 @@ necessary. Here is a sample; alter the names: @@ -335,5 +335,5 @@ necessary. Here is a sample; alter the names:
335 This General Public License does not permit incorporating your program into 335 This General Public License does not permit incorporating your program into
336 proprietary programs. If your program is a subroutine library, you may 336 proprietary programs. If your program is a subroutine library, you may
337 consider it more useful to permit linking proprietary applications with the 337 consider it more useful to permit linking proprietary applications with the
338 -library. If this is what you want to do, use the GNU Library General 338 +library. If this is what you want to do, use the GNU Lesser General
339 Public License instead of this License. 339 Public License instead of this License.