aboutsummaryrefslogtreecommitdiffstats
path: root/src/nsimage.m
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/nsimage.m
parent71784361eb381ec2b12bd8283724a7addec49079 (diff)
parent959ad23fb9020a121c4520946835e9f0aeb9bcb2 (diff)
downloademacs-678fb7066698ebfe3aecba722294025ed26da01b.tar.gz
emacs-678fb7066698ebfe3aecba722294025ed26da01b.zip
merge trunk
Diffstat (limited to 'src/nsimage.m')
-rw-r--r--src/nsimage.m2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nsimage.m b/src/nsimage.m
index 2cb0c3bff76..82a176975ff 100644
--- a/src/nsimage.m
+++ b/src/nsimage.m
@@ -1,5 +1,5 @@
1/* Image support for the NeXT/Open/GNUstep and MacOSX window system. 1/* Image support for the NeXT/Open/GNUstep and MacOSX window system.
2 Copyright (C) 1989, 1992-1994, 2005-2006, 2008-2011 2 Copyright (C) 1989, 1992-1994, 2005-2006, 2008-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.