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
..
closablefilestream.pas
fpcjres.pas
fpcres.pas	# revisions: 46531,46744,46747,47288,47327,47366,47392,47393,47414	2020-12-08 20:32:00 +00:00
fpmake.pp	--- Merging r49045 into '.':	2021-05-20 20:03:52 +00:00
jarsourcehandler.pas
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
msghandler.pas
paramparser.pas	# revisions: 46370,46371,46372,46373,46374,46375,46376,46377,46378,46379,46380,46381,46382,46383,46384,46385,46386,46387,46388,46389,46390,46391,46392,46393,46394,46395,46397	2020-09-09 15:22:17 +00:00
sourcehandler.pas	# revisions: 46370,46371,46372,46373,46374,46375,46376,46377,46378,46379,46380,46381,46382,46383,46384,46385,46386,46387,46388,46389,46390,46391,46392,46393,46394,46395,46397	2020-09-09 15:22:17 +00:00
target.pas	# revisions: 46531,46744,46747,47288,47327,47366,47392,47393,47414	2020-12-08 20:32:00 +00:00