[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v2 0/5] fixes for w32 and NetPBM
From: |
Claudio Bley |
Subject: |
Re: [PATCH v2 0/5] fixes for w32 and NetPBM |
Date: |
Fri, 01 Nov 2013 11:36:31 +0100 |
User-agent: |
Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (Gojō) APEL/10.8 Emacs/24.3.50 (i686-pc-mingw32) MULE/6.0 (HANACHIRUSATO) |
At Fri, 01 Nov 2013 11:12:24 +0200,
Eli Zaretskii wrote:
>
> > Date: Wed, 30 Oct 2013 13:42:50 +0100
> > From: Claudio Bley <address@hidden>
> >
> > This is version 2 of
> > http://lists.gnu.org/archive/html/emacs-devel/2013-10/msg00772.html
> >
> > Changes since v1:
> >
> > - reworded commit message of patch #1 stating that different major
> > versions of jpeglib are indeed binary incompatible
> >
> > - simplified logic of patch #2, using the name libpngXY.dll and
> > libpngXY-XY.dll for versions >= 1.4.0 as per Eli's request
>
> Thanks, installed on your behalf.
Thank you!
> In the future, please also provide ChangeLog entries for your
> changes. (I wrote them this time.)
OK, will do. But, I'm curious, how do you cope with the merge
conflicts popping up for each patch? Do you resolve them manually each
time?
--
Claudio