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: > > 32732 > 32759 > 33016 > 33017 > 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. http://www.stack.nl/~marcov/mergelogs26/fppkg.html _______________________________________________ fpc-devel maillist - fpc-devel@lists.freepascal.org http://lists.freepascal.org/cgi-bin/mailman/listinfo/fpc-devel
