aboutsummaryrefslogtreecommitdiffstats
path: root/src/composite.h
diff options
context:
space:
mode:
authorGlenn Morris2008-05-15 03:28:14 +0000
committerGlenn Morris2008-05-15 03:28:14 +0000
commitb9b1cc1463ecd712077a63f83eb28cddfe85ac47 (patch)
tree82237ebba83754f4a3a4c32ffefeb51cfa1d2c87 /src/composite.h
parent5ac58e4c9355b638a249d55fdffa03e39cf1db03 (diff)
downloademacs-b9b1cc1463ecd712077a63f83eb28cddfe85ac47.tar.gz
emacs-b9b1cc1463ecd712077a63f83eb28cddfe85ac47.zip
Switch to recommended form of GPLv3 permissions notice.
Diffstat (limited to 'src/composite.h')
-rw-r--r--src/composite.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/composite.h b/src/composite.h
index 95f2fc1afb2..3340fdf570b 100644
--- a/src/composite.h
+++ b/src/composite.h
@@ -10,10 +10,10 @@
10 10
11This file is part of GNU Emacs. 11This file is part of GNU Emacs.
12 12
13GNU Emacs is free software; you can redistribute it and/or modify 13GNU Emacs is free software: you can redistribute it and/or modify
14it under the terms of the GNU General Public License as published by 14it under the terms of the GNU General Public License as published by
15the Free Software Foundation; either version 3, or (at your option) 15the Free Software Foundation, either version 3 of the License, or
16any later version. 16(at your option) any later version.
17 17
18GNU Emacs is distributed in the hope that it will be useful, 18GNU Emacs is distributed in the hope that it will be useful,
19but WITHOUT ANY WARRANTY; without even the implied warranty of 19but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,9 +21,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21GNU General Public License for more details. 21GNU General Public License for more details.
22 22
23You should have received a copy of the GNU General Public License 23You should have received a copy of the GNU General Public License
24along with GNU Emacs; see the file COPYING. If not, write to 24along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
25the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
26Boston, MA 02110-1301, USA. */
27 25
28#ifndef EMACS_COMPOSITE_H 26#ifndef EMACS_COMPOSITE_H
29#define EMACS_COMPOSITE_H 27#define EMACS_COMPOSITE_H