aboutsummaryrefslogtreecommitdiffstats
path: root/src/Makefile.in
diff options
context:
space:
mode:
authorKaroly Lorentey2005-05-09 16:13:15 +0000
committerKaroly Lorentey2005-05-09 16:13:15 +0000
commit85dc59a9ff65aaf6b8e6a0c4452f74b7dade88fd (patch)
tree85aebc58216ed19de18354b3d9974942eea621d5 /src/Makefile.in
parentc25b55138a36cf5f334070baf79ce61c1e956eed (diff)
parentc7bda15b58de3efcf856786167f11f5b4175e30b (diff)
downloademacs-85dc59a9ff65aaf6b8e6a0c4452f74b7dade88fd.tar.gz
emacs-85dc59a9ff65aaf6b8e6a0c4452f74b7dade88fd.zip
Merged from miles@gnu.org--gnu-2005 (patch 292-295)
Patches applied: * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-292 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-293 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-294 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-295 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-342
Diffstat (limited to 'src/Makefile.in')
-rw-r--r--src/Makefile.in2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/Makefile.in b/src/Makefile.in
index a7013ce4de5..3407f9024ef 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -784,6 +784,7 @@ lisp= \
784 ${lispsource}textmodes/paragraphs.elc \ 784 ${lispsource}textmodes/paragraphs.elc \
785 ${lispsource}textmodes/text-mode.elc \ 785 ${lispsource}textmodes/text-mode.elc \
786 ${lispsource}emacs-lisp/timer.elc \ 786 ${lispsource}emacs-lisp/timer.elc \
787 ${lispsource}jka-cmpr-hook.elc \
787 ${lispsource}vc-hooks.elc \ 788 ${lispsource}vc-hooks.elc \
788 ${lispsource}ediff-hook.elc \ 789 ${lispsource}ediff-hook.elc \
789 TOOLTIP_SUPPORT \ 790 TOOLTIP_SUPPORT \
@@ -878,6 +879,7 @@ shortlisp= \
878 ../lisp/textmodes/text-mode.elc \ 879 ../lisp/textmodes/text-mode.elc \
879 ../lisp/emacs-lisp/timer.elc \ 880 ../lisp/emacs-lisp/timer.elc \
880 ../lisp/vc-hooks.elc \ 881 ../lisp/vc-hooks.elc \
882 ../lisp/jka-cmpr-hook.elc \
881 ../lisp/ediff-hook.elc \ 883 ../lisp/ediff-hook.elc \
882 ../lisp/widget.elc \ 884 ../lisp/widget.elc \
883 ../lisp/window.elc \ 885 ../lisp/window.elc \