diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2007-07-19 17:45:29 +0000 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2007-07-19 17:45:29 +0000 |
| commit | 43e4846f1153b7fc199a46c29f5b73c1cff49757 (patch) | |
| tree | daa26b8aba3d46d5f3dad05977dc4e1719040e37 /src/diff3.c | |
| parent | 4e45d1d3241f2dbe27d1d434b5e44077457528d6 (diff) | |
| download | diffutils-43e4846f1153b7fc199a46c29f5b73c1cff49757.tar.gz | |
* COPYING: New file.
* AUTHORS: Update from GPLv2 to GPLv3.
* Makefile.am: Likewise.
* NEWS: Likewise.
* README: Likewise.
* README-hacking: Likewise.
* bootstrap: Likewise.
* bootstrap.conf: Likewise.
* configure.ac: Likewise.
* exgettext: Likewise.
* doc/Makefile.am: Likewise.
* lib/Makefile.am: Likewise.
* lib/cmpbuf.c: Likewise.
* lib/cmpbuf.h: Likewise.
* lib/prepargs.c: Likewise.
* m4/vararrays.m4: Likewise.
* man/Makefile.am: Likewise.
* ms/Makefile.am: Likewise.
* ms/README: Likewise.
* ms/config.bat: Likewise.
* ms/config.sed: Likewise.
* ms/config.site: Likewise.
* po/POTFILES.in: Likewise.
* src/Makefile.am: Likewise.
* src/analyze.c: Likewise.
* src/cmp.c: Likewise.
* src/context.c: Likewise.
* src/diff.c: Likewise.
* src/diff.h: Likewise.
* src/diff3.c: Likewise.
* src/dir.c: Likewise.
* src/ed.c: Likewise.
* src/io.c: Likewise.
* src/normal.c: Likewise.
* src/sdiff.c: Likewise.
* src/system.h: Likewise.
* src/util.c: Likewise.
Diffstat (limited to 'src/diff3.c')
| -rw-r--r-- | src/diff3.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/diff3.c b/src/diff3.c index 9609786..20e2e9c 100644 --- a/src/diff3.c +++ b/src/diff3.c @@ -3,20 +3,18 @@ Copyright (C) 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1998, 2001, 2002, 2004, 2006 Free Software Foundation, Inc. - This program is free software; you can redistribute it and/or modify + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. - If not, write to the Free Software Foundation, - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "system.h" #include "paths.h" |