ns merge conflicts

all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed

* ns merge conflicts
@ 2014-11-01 18:07 Glenn Morris
  2014-11-01 20:07 ` Jan Djärv
  0 siblings, 1 reply; 2+ messages in thread
From: Glenn Morris @ 2014-11-01 18:07 UTC (permalink / raw)
  To: Jan Djärv; +Cc: emacs-devel

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.

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: ns merge conflicts
  2014-11-01 18:07 ns merge conflicts Glenn Morris
@ 2014-11-01 20:07 ` Jan Djärv
  0 siblings, 0 replies; 2+ messages in thread
From: Jan Djärv @ 2014-11-01 20:07 UTC (permalink / raw)
  To: Glenn Morris; +Cc: emacs-devel

Hello.

> 1 nov 2014 kl. 19:07 skrev Glenn Morris <rgm@gnu.org>:
> 
> 
> 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.




^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2014-11-01 20:07 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-01 18:07 ns merge conflicts Glenn Morris
2014-11-01 20:07 ` Jan Djärv

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.