aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2011-02-09 19:16:11 -0800
committerPaul Eggert2011-02-09 19:16:11 -0800
commit988c07dff201e8c6471930a33e2a1069550784e1 (patch)
tree948922dadac77083101f48ea411d8393b1fc3efe
parent26d2a9bd7ac94278f71522f2bf374c97e7dfa37a (diff)
downloademacs-988c07dff201e8c6471930a33e2a1069550784e1.tar.gz
emacs-988c07dff201e8c6471930a33e2a1069550784e1.zip
* arg-nonnull.h, c++defs.h, warn-on-use.h: Fix licenses.
-rw-r--r--ChangeLog7
-rw-r--r--arg-nonnull.h2
-rw-r--r--c++defs.h2
-rw-r--r--warn-on-use.h2
4 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index d75ec5150f7..2a0dd144670 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
12011-02-10 Paul Eggert <eggert@cs.ucla.edu>
2
3 * arg-nonnull.h, c++defs.h, warn-on-use.h: Fix licenses.
4 Sync from gnulib, which has been patched to fix the problem
5 with the license notices. Problem reported by Glenn Morris in
6 <http://lists.gnu.org/archive/html/emacs-devel/2011-02/msg00403.html>.
7
12011-02-09 Stefan Monnier <monnier@iro.umontreal.ca> 82011-02-09 Stefan Monnier <monnier@iro.umontreal.ca>
2 9
3 * .bzrignore: Ignore globals.h and related stamp. 10 * .bzrignore: Ignore globals.h and related stamp.
diff --git a/arg-nonnull.h b/arg-nonnull.h
index 226d1a86998..6c2f1e82d06 100644
--- a/arg-nonnull.h
+++ b/arg-nonnull.h
@@ -9,7 +9,7 @@
9 This program is distributed in the hope that it will be useful, 9 This program is distributed in the hope that it will be useful,
10 but WITHOUT ANY WARRANTY; without even the implied warranty of 10 but WITHOUT ANY WARRANTY; without even the implied warranty of
11 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12 Lesser General Public License for more details. 12 General Public License for more details.
13 13
14 You should have received a copy of the GNU General Public License 14 You should have received a copy of the GNU General Public License
15 along with this program. If not, see <http://www.gnu.org/licenses/>. */ 15 along with this program. If not, see <http://www.gnu.org/licenses/>. */
diff --git a/c++defs.h b/c++defs.h
index d521417069a..b6821a64ac4 100644
--- a/c++defs.h
+++ b/c++defs.h
@@ -9,7 +9,7 @@
9 This program is distributed in the hope that it will be useful, 9 This program is distributed in the hope that it will be useful,
10 but WITHOUT ANY WARRANTY; without even the implied warranty of 10 but WITHOUT ANY WARRANTY; without even the implied warranty of
11 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12 Lesser General Public License for more details. 12 General Public License for more details.
13 13
14 You should have received a copy of the GNU General Public License 14 You should have received a copy of the GNU General Public License
15 along with this program. If not, see <http://www.gnu.org/licenses/>. */ 15 along with this program. If not, see <http://www.gnu.org/licenses/>. */
diff --git a/warn-on-use.h b/warn-on-use.h
index fdf250e9f40..2cdeec3e663 100644
--- a/warn-on-use.h
+++ b/warn-on-use.h
@@ -9,7 +9,7 @@
9 This program is distributed in the hope that it will be useful, 9 This program is distributed in the hope that it will be useful,
10 but WITHOUT ANY WARRANTY; without even the implied warranty of 10 but WITHOUT ANY WARRANTY; without even the implied warranty of
11 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12 Lesser General Public License for more details. 12 General Public License for more details.
13 13
14 You should have received a copy of the GNU General Public License 14 You should have received a copy of the GNU General Public License
15 along with this program. If not, see <http://www.gnu.org/licenses/>. */ 15 along with this program. If not, see <http://www.gnu.org/licenses/>. */