The sources of the Free Pascal compiler, RTL, packages and utilities. See https://www.freepascal.org/ for more info.
Go to file
marco 3037276c8a --- Merging r49165 into '.':
U    packages/fcl-registry/src/registry.pp
--- Recording mergeinfo for merge of r49165 into '.':
 U   .
--- Merging r49166 into '.':
U    packages/hash/src/sha1.pp
--- Recording mergeinfo for merge of r49166 into '.':
 G   .
--- Merging r49167 into '.':
U    packages/iconvenc/src/iconvert.inc
--- Recording mergeinfo for merge of r49167 into '.':
 G   .

# revisions: 49165,49166,49167
r49165 | marco | 2021-04-10 15:53:57 +0200 (Sat, 10 Apr 2021) | 3 lines
Changed paths:
   M /trunk/packages/fcl-registry/src/registry.pp

 * fix from bart for mantis #0038581 that prohibits reusing readbinarydata
   as basis for a multisz reader.
r49166 | marco | 2021-04-10 16:26:20 +0200 (Sat, 10 Apr 2021) | 1 line
Changed paths:
   M /trunk/packages/hash/src/sha1.pp

 * raise exception when file not found.
r49167 | marco | 2021-04-10 16:58:53 +0200 (Sat, 10 Apr 2021) | 2 lines
Changed paths:
   M /trunk/packages/iconvenc/src/iconvert.inc

 * implemented recommendations from mantis #038510 for better bionic
   compatibility.

git-svn-id: branches/fixes_3_2@49221 -
2021-04-17 14:45:55 +00:00
compiler --- Merging r49206 into '.': 2021-04-15 19:16:05 +00:00
installer Merge commit 48814: 2021-03-23 23:59:37 +00:00
packages --- Merging r49165 into '.': 2021-04-17 14:45:55 +00:00
rtl --- Merging r49115 into '.': 2021-04-03 19:42:31 +00:00
tests --- Merging r49206 into '.': 2021-04-15 19:16:05 +00:00
utils Fix error in conflict resolution of previous merge 2021-03-24 00:11:34 +00:00
.gitattributes --- Merging r49206 into '.': 2021-04-15 19:16:05 +00:00
.gitignore --- Merging r47259 into '.': 2020-11-25 16:11:10 +00:00
fpmake_add1.inc
fpmake_proc1.inc
fpmake.pp --- Merging (from foreign repository) r44152 into '.': 2020-02-21 14:50:44 +00:00
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