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
..
docs	--- Merging r42937 into '.':	2019-10-12 16:15:55 +00:00
examples	--- Merging r49045 into '.':	2021-05-20 20:03:52 +00:00
src	--- Merging r47236 into '.':	2020-11-30 18:14:22 +00:00
tests	* merged all changes from ptc trunk from sourceforge; adds support for different	2017-06-20 00:23: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
Makefile.fpc.fpcmake	--- Merging r49045 into '.':	2021-05-20 20:03:52 +00:00