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/xrdb.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/xrdb.c')
| -rw-r--r-- | src/xrdb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/xrdb.c b/src/xrdb.c index 59b0876ebf8..c25c25d6f33 100644 --- a/src/xrdb.c +++ b/src/xrdb.c | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | /* Deal with the X Resource Manager. | 1 | /* Deal with the X Resource Manager. |
| 2 | Copyright (C) 1990, 1993-1994, 2000-2012 Free Software Foundation, Inc. | 2 | Copyright (C) 1990, 1993-1994, 2000-2013 Free Software Foundation, |
| 3 | Inc. | ||
| 3 | 4 | ||
| 4 | Author: Joseph Arceneaux | 5 | Author: Joseph Arceneaux |
| 5 | Created: 4/90 | 6 | Created: 4/90 |