diff options
| author | Eli Zaretskii | 2013-03-28 20:13:59 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2013-03-28 20:13:59 +0200 |
| commit | d76bf86f438d4f5f9fe493ab76f02ffc78f3ae2e (patch) | |
| tree | 04fa8bc7bd2058a316a7ee30f8741d25bfd0b060 /src/tparam.c | |
| parent | 2ef26ceb192c7683754cf0b4aa3087f501254332 (diff) | |
| parent | e74aeda863cd6896e06e92586f87b45d63d67d15 (diff) | |
| download | emacs-d76bf86f438d4f5f9fe493ab76f02ffc78f3ae2e.tar.gz emacs-d76bf86f438d4f5f9fe493ab76f02ffc78f3ae2e.zip | |
Merge from trunk and resolve conflicts.
Diffstat (limited to 'src/tparam.c')
| -rw-r--r-- | src/tparam.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/tparam.c b/src/tparam.c index 164f61d471b..c3ecfb9e3a3 100644 --- a/src/tparam.c +++ b/src/tparam.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* Merge parameters into a termcap entry string. | 1 | /* Merge parameters into a termcap entry string. |
| 2 | Copyright (C) 1985, 1987, 1993, 1995, 2000, 2001, 2002, 2003, 2004, | 2 | Copyright (C) 1985, 1987, 1993, 1995, 2000-2008, 2013 Free Software |
| 3 | 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | 3 | Foundation, Inc. |
| 4 | 4 | ||
| 5 | This program is free software; you can redistribute it and/or modify | 5 | This program is free software; you can redistribute it and/or modify |
| 6 | it under the terms of the GNU General Public License as published by | 6 | it under the terms of the GNU General Public License as published by |
| @@ -13,9 +13,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |||
| 13 | GNU General Public License for more details. | 13 | GNU General Public License for more details. |
| 14 | 14 | ||
| 15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU General Public License |
| 16 | along with this program; see the file COPYING. If not, write to | 16 | along with this program. If not, see <http://www.gnu.org/licenses/>. */ |
| 17 | the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | ||
| 18 | Boston, MA 02110-1301, USA. */ | ||
| 19 | 17 | ||
| 20 | /* Emacs config.h may rename various library functions such as malloc. */ | 18 | /* Emacs config.h may rename various library functions such as malloc. */ |
| 21 | #include <config.h> | 19 | #include <config.h> |