diff options
author | Glenn Morris <rgm@gnu.org> | 2010-03-10 22:58:54 -0800 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2010-03-10 22:58:54 -0800 |
commit | c7415cfc45627e32f34d40245625a8b89d7ac6d7 (patch) | |
tree | f58798c8d1c7bb6a4c90daf8863ffaab8db01a2d | |
parent | 7af1d7ff6f45709e9486e63523fbf62e9f690a3a (diff) | |
download | emacs-c7415cfc45627e32f34d40245625a8b89d7ac6d7.tar.gz |
License updates for some test/cedet/tests files.
* testjavacomp.java, testpolymorph.cpp: Convert copyright of author
with assignment to FSF copyright. Add 2010. Relicense under GPLv3+.
-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 @@ /** testjavacomp.java --- * - * Copyright (C) 2009 Eric M. Ludlam + * Copyright (C) 2009, 2010 Free Software Foundation, Inc. * * Author: Eric M. Ludlam <eric@siege-engine.com> * - * 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. - * - * 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. - * + * This file is part of GNU Emacs. + * + * GNU Emacs 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 3 of the License, or + * (at your option) any later version. + * + * GNU Emacs 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. + * * 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, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ 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 @@ /** testpolymorph.cpp --- A sequence of polymorphism examples. * - * Copyright (C) 2009 Eric M. Ludlam + * Copyright (C) 2009, 2010 Free Software Foundation, Inc. * * Author: Eric M. Ludlam <eric@siege-engine.com> * - * 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. + * This file is part of GNU Emacs. * - * 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. + * GNU Emacs 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 3 of the License, or + * (at your option) any later version. + * + * GNU Emacs 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. * * 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, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include <cmath> |