|
| From: | Jan Djärv |
| Subject: | Re: ns merge conflicts |
| Date: | Sat, 1 Nov 2014 21:07:11 +0100 |
Hello.
> 1 nov 2014 kl. 19:07 skrev Glenn Morris <address@hidden>:
>
>
> 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.
Done.
Jan D.
| [Prev in Thread] | Current Thread | [Next in Thread] |