diff options
| author | Stefan Monnier | 2010-03-24 14:02:56 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2010-03-24 14:02:56 -0400 |
| commit | e867cb5d30200dd696b012e1ad0964d25c2a7ecc (patch) | |
| tree | 3340026420f168909eaa734232e4890e15bc1626 /test | |
| parent | b2b8574b8d03673f5673e2154d17c2cb80f59a0b (diff) | |
| parent | efee6a6d9cec2af824b8355c93d8f47b72a685a8 (diff) | |
| download | emacs-e867cb5d30200dd696b012e1ad0964d25c2a7ecc.tar.gz emacs-e867cb5d30200dd696b012e1ad0964d25c2a7ecc.zip | |
Merge from `emacs-23'.
Diffstat (limited to 'test')
| -rw-r--r-- | test/cedet/tests/testjavacomp.java | 28 | ||||
| -rw-r--r-- | test/cedet/tests/testpolymorph.cpp | 24 |
2 files changed, 26 insertions, 26 deletions
diff --git a/test/cedet/tests/testjavacomp.java b/test/cedet/tests/testjavacomp.java index feffe660e04..3c2c2ef4ebe 100644 --- a/test/cedet/tests/testjavacomp.java +++ b/test/cedet/tests/testjavacomp.java | |||
| @@ -1,23 +1,23 @@ | |||
| 1 | /** testjavacomp.java --- | 1 | /** testjavacomp.java --- |
| 2 | * | 2 | * |
| 3 | * Copyright (C) 2009 Eric M. Ludlam | 3 | * Copyright (C) 2009, 2010 Free Software Foundation, Inc. |
| 4 | * | 4 | * |
| 5 | * Author: Eric M. Ludlam <eric@siege-engine.com> | 5 | * Author: Eric M. Ludlam <eric@siege-engine.com> |
| 6 | * | 6 | * |
| 7 | * This program is free software; you can redistribute it and/or | 7 | * This file is part of GNU Emacs. |
| 8 | * modify it under the terms of the GNU General Public License as | 8 | * |
| 9 | * published by the Free Software Foundation; either version 2, or (at | 9 | * GNU Emacs is free software: you can redistribute it and/or modify |
| 10 | * your option) any later version. | 10 | * it under the terms of the GNU General Public License as published by |
| 11 | * | 11 | * the Free Software Foundation, either version 3 of the License, or |
| 12 | * This program is distributed in the hope that it will be useful, but | 12 | * (at your option) any later version. |
| 13 | * WITHOUT ANY WARRANTY; without even the implied warranty of | 13 | * |
| 14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 14 | * GNU Emacs is distributed in the hope that it will be useful, |
| 15 | * General Public License for more details. | 15 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 16 | * | 16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 17 | * GNU General Public License for more details. | ||
| 18 | * | ||
| 17 | * You should have received a copy of the GNU General Public License | 19 | * You should have received a copy of the GNU General Public License |
| 18 | * along with this program; see the file COPYING. If not, write to | 20 | * along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
| 19 | * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | ||
| 20 | * Boston, MA 02110-1301, USA. | ||
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | package tests.testjavacomp; | 23 | package tests.testjavacomp; |
diff --git a/test/cedet/tests/testpolymorph.cpp b/test/cedet/tests/testpolymorph.cpp index 51f933cf7fd..329f4d598f4 100644 --- a/test/cedet/tests/testpolymorph.cpp +++ b/test/cedet/tests/testpolymorph.cpp | |||
| @@ -1,23 +1,23 @@ | |||
| 1 | /** testpolymorph.cpp --- A sequence of polymorphism examples. | 1 | /** testpolymorph.cpp --- A sequence of polymorphism examples. |
| 2 | * | 2 | * |
| 3 | * Copyright (C) 2009 Eric M. Ludlam | 3 | * Copyright (C) 2009, 2010 Free Software Foundation, Inc. |
| 4 | * | 4 | * |
| 5 | * Author: Eric M. Ludlam <eric@siege-engine.com> | 5 | * Author: Eric M. Ludlam <eric@siege-engine.com> |
| 6 | * | 6 | * |
| 7 | * This program is free software; you can redistribute it and/or | 7 | * This file is part of GNU Emacs. |
| 8 | * modify it under the terms of the GNU General Public License as | ||
| 9 | * published by the Free Software Foundation; either version 2, or (at | ||
| 10 | * your option) any later version. | ||
| 11 | * | 8 | * |
| 12 | * This program is distributed in the hope that it will be useful, but | 9 | * GNU Emacs is free software: you can redistribute it and/or modify |
| 13 | * WITHOUT ANY WARRANTY; without even the implied warranty of | 10 | * it under the terms of the GNU General Public License as published by |
| 14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 11 | * the Free Software Foundation, either version 3 of the License, or |
| 15 | * General Public License for more details. | 12 | * (at your option) any later version. |
| 13 | * | ||
| 14 | * GNU Emacs is distributed in the hope that it will be useful, | ||
| 15 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 17 | * GNU General Public License for more details. | ||
| 16 | * | 18 | * |
| 17 | * You should have received a copy of the GNU General Public License | 19 | * You should have received a copy of the GNU General Public License |
| 18 | * along with this program; see the file COPYING. If not, write to | 20 | * along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
| 19 | * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | ||
| 20 | * Boston, MA 02110-1301, USA. | ||
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <cmath> | 23 | #include <cmath> |