[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Merge from emacs-24 up to a5f38fa
|
From: |
Stefan Monnier |
|
Subject: |
Re: Merge from emacs-24 up to a5f38fa |
|
Date: |
Sun, 28 Dec 2014 15:44:07 -0500 |
|
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) |
> So this is my first incursion merging the `emacs-24` branch into
> `master`.
Thanks for taking on this merge, it's very appreciated.
> I have used `gitmerge.el` and everything looks well from here; this
> the complete list of conflicts in case you want to take a look:
I haven't looked in detail, but what I saw looked fine,
Stefan