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/deps.mk | |
| parent | 98fb480ee31bf74cf554044f60f21df16566dd7f (diff) | |
| parent | e99a9b8bdccadded1f6fae88ee7a2a93dfd4eacf (diff) | |
| download | emacs-pending.tar.gz emacs-pending.zip | |
Merge from trunkpending
Diffstat (limited to 'src/deps.mk')
| -rw-r--r-- | src/deps.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/deps.mk b/src/deps.mk index 080144ae1e5..c7316a24dad 100644 --- a/src/deps.mk +++ b/src/deps.mk | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ### deps.mk --- src/Makefile fragment for GNU Emacs | 1 | ### deps.mk --- src/Makefile fragment for GNU Emacs |
| 2 | 2 | ||
| 3 | ## Copyright (C) 1985, 1987-1988, 1993-1995, 1999-2011 | 3 | ## Copyright (C) 1985, 1987-1988, 1993-1995, 1999-2012 |
| 4 | ## Free Software Foundation, Inc. | 4 | ## Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | ## This file is part of GNU Emacs. | 6 | ## This file is part of GNU Emacs. |
| @@ -39,7 +39,7 @@ | |||
| 39 | atimer.o: atimer.c atimer.h syssignal.h systime.h lisp.h blockinput.h \ | 39 | atimer.o: atimer.c atimer.h syssignal.h systime.h lisp.h blockinput.h \ |
| 40 | globals.h ../lib/unistd.h $(config_h) | 40 | globals.h ../lib/unistd.h $(config_h) |
| 41 | bidi.o: bidi.c buffer.h character.h dispextern.h msdos.h lisp.h \ | 41 | bidi.o: bidi.c buffer.h character.h dispextern.h msdos.h lisp.h \ |
| 42 | biditype.h bidimirror.h globals.h $(config_h) | 42 | globals.h $(config_h) |
| 43 | buffer.o: buffer.c buffer.h region-cache.h commands.h window.h \ | 43 | buffer.o: buffer.c buffer.h region-cache.h commands.h window.h \ |
| 44 | $(INTERVALS_H) blockinput.h atimer.h systime.h character.h ../lib/unistd.h \ | 44 | $(INTERVALS_H) blockinput.h atimer.h systime.h character.h ../lib/unistd.h \ |
| 45 | indent.h keyboard.h coding.h keymap.h frame.h lisp.h globals.h $(config_h) | 45 | indent.h keyboard.h coding.h keymap.h frame.h lisp.h globals.h $(config_h) |