The sources of the Free Pascal compiler, RTL, packages and utilities. See https://www.freepascal.org/ for more info.
Go to file
pierre 73feaf992c Merge 43103, removing conflict
------------------------------------------------------------------------
r43103 | pierre | 2019-10-01 12:50:26 +0000 (Tue, 01 Oct 2019) | 1 line

 Remove symbian from fppkg OS list
------------------------------------------------------------------------
--- Merging r43103 into '.':
C    utils/fppkg/fpmake.pp
--- Recording mergeinfo for merge of r43103 into '.':
 U   .
Summary of conflicts:
  Text conflicts: 1

git-svn-id: branches/fixes_3_2@46924 -
2020-09-23 11:39:55 +00:00
compiler Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
installer Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
packages Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
rtl Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
tests Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
utils Merge 43103, removing conflict 2020-09-23 11:39:55 +00:00
.gitattributes * merged macOS/AArch64 support + revisions these changes depended on 2020-09-15 19:40:36 +00:00
.gitignore --- Merging r45818 into '.': 2020-07-28 14:41:40 +00:00
fpmake_add1.inc
fpmake_proc1.inc
fpmake.pp
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 * merged macOS/AArch64 support + revisions these changes depended on 2020-09-15 19:40:36 +00:00