fpc/packages/fcl-xml
marco 74aff88586 --- Merging r49045 into '.':
C    Makefile
C    Makefile.fpc
--- Recording mergeinfo for merge of r49045 into '.':
 U   .
Summary of conflicts:
  Text conflicts: 2

# revisions: 49045
r49045 | jonas | 2021-03-24 15:33:09 +0100 (Wed, 24 Mar 2021) | 1 line
Changed paths:
   M /trunk/Makefile
   M /trunk/Makefile.fpc

  * support building with FPC 3.2.2

git-svn-id: branches/fixes_3_2@49384 -
2021-05-20 20:03:52 +00:00
..
examples # revisions: 44293,44294,44435,44877,45188,45539 2020-06-24 17:20:11 +00:00
src # revisions: 46531,46744,46747,47288,47327,47366,47392,47393,47414 2020-12-08 20:32:00 +00:00
tests * spelling mistakes fpc repo part, mantis #30233 2016-06-02 20:01:09 +00:00
buildfclxml.lpi * Patch from Martok to fix compilation using build project (Bug ID 32322) 2017-08-24 08:11:15 +00:00
buildfclxml.pp * Patch from Martok to fix compilation using build project (Bug ID 32322) 2017-08-24 08:11:15 +00:00
fpmake.pp --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
Makefile --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
Makefile.fpc --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
Makefile.fpc.fpcmake --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00