[fpc-devel] Last call for 3.0.4 merges
Marco van de Voort
marcov at stack.nl
Tue Jun 20 11:22:20 CEST 2017
In our previous episode, Joost van der Sluis said:
[ Charset UTF-8 unsupported, converting... ]
> Op 19-06-17 om 22:52 schreef Joost van der Sluis:
> > I'll see if I can make a list with hotfixes. Which will be a pain to
> > merge, as the code in which the fixes are done might even not exist
> > anymore.
> > But I think we have to change http into https in a few places...
> Ok, please merge:
> 33033 *
The first four merge, but the fifth has conflicts that are easily resolved
but won't compile. r32022 ?
I did a query for fpmkunit.pp and added it to the mergelogs fppkg /fpmkunit
category, so that all fpmkunit.pp revs are 100% there.
More information about the fpc-devel