|
| From: | Glenn Morris |
| Subject: | ns merge conflicts |
| Date: | Sat, 01 Nov 2014 14:07:22 -0400 |
| User-agent: | Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) |
There were conflicts (in macfont.m and nsterm.m) when merging recent NS changes from emacs-24 to trunk. Please could you check the result.
| [Prev in Thread] | Current Thread | [Next in Thread] |