aboutsummaryrefslogtreecommitdiffstats
path: root/src/alloc.c
diff options
context:
space:
mode:
authorKenichi Handa2012-01-21 20:36:42 +0900
committerKenichi Handa2012-01-21 20:36:42 +0900
commit678fb7066698ebfe3aecba722294025ed26da01b (patch)
tree951ac3055141d950974051d13c10e5d7c6a98e31 /src/alloc.c
parent71784361eb381ec2b12bd8283724a7addec49079 (diff)
parent959ad23fb9020a121c4520946835e9f0aeb9bcb2 (diff)
downloademacs-678fb7066698ebfe3aecba722294025ed26da01b.tar.gz
emacs-678fb7066698ebfe3aecba722294025ed26da01b.zip
merge trunk
Diffstat (limited to 'src/alloc.c')
-rw-r--r--src/alloc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/alloc.c b/src/alloc.c
index 6f70976c345..044e750413b 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -1,5 +1,5 @@
1/* Storage allocation and gc for GNU Emacs Lisp interpreter. 1/* Storage allocation and gc for GNU Emacs Lisp interpreter.
2 Copyright (C) 1985-1986, 1988, 1993-1995, 1997-2011 2 Copyright (C) 1985-1986, 1988, 1993-1995, 1997-2012
3 Free Software Foundation, Inc. 3 Free Software Foundation, Inc.
4 4
5This file is part of GNU Emacs. 5This file is part of GNU Emacs.