|Subject:||Re: NS compile error after trunk merge r118324|
|Date:||Mon, 10 Nov 2014 02:40:59 -0500|
|User-agent:||Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/)|
BTw, if you (anyone) knows there is going to be a non-trivial merge conflict, you can mark the emacs-24 change "do not merge to trunk" and apply it by hand yourself to trunk.
|[Prev in Thread]||Current Thread||[Next in Thread]|