fpc/packages/fcl-report
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
..
demos * Merging revisions r43889,r43891,r43895,r43899,r43900,r43930,r43954,r43955,r43973 from trunk: 2020-01-19 16:20:08 +00:00
src # revisions: 46268,46325,46349,46716,46722 2020-09-09 15:50:11 +00:00
test * Merging revisions 44004 from trunk: 2020-02-12 09:17:32 +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
todo.txt