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
..
default.cft	* Create fppkg-config files in the new format (v5)	2016-10-16 15:43:27 +00:00
default.inc	* Create fppkg-config files in the new format (v5)	2016-10-16 15:43:27 +00:00
fpc.cft	* rest of the previous accidental partial commit	2019-02-07 19:56:21 +00:00
fpccfg.inc	* rest of the previous accidental partial commit	2019-02-07 19:56:21 +00:00
fpcfg.inc
fpcmkcfg.pp	--- Merging r45794 into '.':	2020-11-25 17:16:26 +00:00
fpinc.cfg
fpinc.ini
fpini.inc
fpmake.pp	--- Merging r49045 into '.':	2021-05-20 20:03:52 +00:00
fppkg.cfg	--- Merging r41184 into '.':	2020-02-18 22:27:08 +00:00
fppkg.inc	--- Merging r41184 into '.':	2020-02-18 22:27:08 +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