diff options
| author | Stefan Monnier | 2012-03-25 16:37:21 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2012-03-25 16:37:21 -0400 |
| commit | 699c782b7668c44d0fa4446331b0590a6d5dac82 (patch) | |
| tree | 5dcce364741d0761920a3d274b0fc8aba4103d45 /src/nsimage.m | |
| parent | 98fb480ee31bf74cf554044f60f21df16566dd7f (diff) | |
| parent | e99a9b8bdccadded1f6fae88ee7a2a93dfd4eacf (diff) | |
| download | emacs-pending.tar.gz emacs-pending.zip | |
Merge from trunkpending
Diffstat (limited to 'src/nsimage.m')
| -rw-r--r-- | src/nsimage.m | 2 |
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 | ||
| 5 | This file is part of GNU Emacs. | 5 | This file is part of GNU Emacs. |