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
..
avx	* updated FSF address (mantis #30198, patch by Paul Gevers)	2016-10-02 12:56:59 +00:00
dosbox	Merge of commit 44022	2020-02-11 08:58:01 +00:00
macos
testsuite	--- Merging r49045 into '.':	2021-05-20 20:03:52 +00:00
variants
bench.pp
concat.pp
createlst.pp	Ensure '/' is used as directory separator to get same output as before	2016-08-18 11:43:56 +00:00
dbconfig.pp	Fix compilation of dbconfig program	2018-06-05 22:10:20 +00:00
dbdigest.pp	Change is_new local variable name to count_test, to reflect change in AddTestResult function	2018-06-05 21:38:50 +00:00
dbtests.pp	Change is_new parameter name to count_it, set it to true if new TestRes is different from previously in Database	2018-06-05 21:37:35 +00:00
digest.pp
dotest.pp	Merged revision(s) 39911 from trunk:	2020-01-27 14:50:56 +00:00
fail.pp
fptime.pp
fpts2junit.pp	fpts2junit: fix compilation, remove non printable chars from xml text, cut big error texts to last 1000 chars	2017-05-30 20:36:16 +00:00
gparmake.pp
libtar.pas
Makefile	Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini	2020-09-23 09:47:20 +00:00
Makefile.fpc	Add explict dependencies to used units	2018-06-05 21:39:44 +00:00
prepup.pp
redir.pp
testfail.pp
tests.sql
teststr.pp
testu.pp	Move GetToken function to testu unit	2018-04-04 21:27:07 +00:00
tresults.pp