diff options
| author | jave | 2015-01-02 16:30:55 +0100 |
|---|---|---|
| committer | jave | 2015-01-02 16:30:55 +0100 |
| commit | db4613576d3115aa320f0293d081ce98baa06acd (patch) | |
| tree | 829968643b451bd3f64c791e4d3a6c928010e14c /src/alloc.c | |
| parent | c089503bac34376e75ae6f1d2c289fc8c9f42b8f (diff) | |
| parent | d0ca1148fe2d1e72e86f0197731071f139c143e3 (diff) | |
| download | emacs-db4613576d3115aa320f0293d081ce98baa06acd.tar.gz emacs-db4613576d3115aa320f0293d081ce98baa06acd.zip | |
merge master
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/alloc.c b/src/alloc.c index eada96c0c10..ecea3e8ac7d 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* Storage allocation and gc for GNU Emacs Lisp interpreter. | 1 | /* Storage allocation and gc for GNU Emacs Lisp interpreter. |
| 2 | 2 | ||
| 3 | Copyright (C) 1985-1986, 1988, 1993-1995, 1997-2014 Free Software | 3 | Copyright (C) 1985-1986, 1988, 1993-1995, 1997-2015 Free Software |
| 4 | Foundation, Inc. | 4 | Foundation, Inc. |
| 5 | 5 | ||
| 6 | This file is part of GNU Emacs. | 6 | This file is part of GNU Emacs. |