diff options
| author | Karoly Lorentey | 2005-12-26 03:16:59 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2005-12-26 03:16:59 +0000 |
| commit | feba0cd6405ebb80af743e2f978442d9c837bcd2 (patch) | |
| tree | 1cb964aa641bee514d9cda2eafe27a0a97e65ad1 /mac | |
| parent | 30663b475e57197c9896a252e1d4ca31c579fa2b (diff) | |
| parent | 7a32e81fb608282314e27db21a00138aaa91f29a (diff) | |
| download | emacs-feba0cd6405ebb80af743e2f978442d9c837bcd2.tar.gz emacs-feba0cd6405ebb80af743e2f978442d9c837bcd2.zip | |
Merged from miles@gnu.org--gnu-2005 (patch 677)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-677
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-463
Diffstat (limited to 'mac')
| -rw-r--r-- | mac/ChangeLog | 4 | ||||
| -rw-r--r-- | mac/makefile.MPW | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/mac/ChangeLog b/mac/ChangeLog index cc097906046..5f538eb09e0 100644 --- a/mac/ChangeLog +++ b/mac/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2005-12-19 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | ||
| 2 | |||
| 3 | * makefile.MPW (macselect.c.x): Depend on keymap.h. | ||
| 4 | |||
| 1 | 2005-12-10 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 5 | 2005-12-10 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> |
| 2 | 6 | ||
| 3 | * Emacs.app/Contents/Info.plist: Add CFBundleURLTypes key and | 7 | * Emacs.app/Contents/Info.plist: Add CFBundleURLTypes key and |
diff --git a/mac/makefile.MPW b/mac/makefile.MPW index 4c999a90dfa..ec9e4126371 100644 --- a/mac/makefile.MPW +++ b/mac/makefile.MPW | |||
| @@ -903,6 +903,7 @@ buildobj.lst Ä | |||
| 903 | "{Src}macterm.h" ¶ | 903 | "{Src}macterm.h" ¶ |
| 904 | "{Src}macgui.h" ¶ | 904 | "{Src}macgui.h" ¶ |
| 905 | "{Src}frame.h" ¶ | 905 | "{Src}frame.h" ¶ |
| 906 | "{Src}keymap.h" ¶ | ||
| 906 | {BLOCKINPUT_H_GROUP} | 907 | {BLOCKINPUT_H_GROUP} |
| 907 | 908 | ||
| 908 | {Src}mac.c Ä ¶ | 909 | {Src}mac.c Ä ¶ |