paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-05 04:18:31 +02:00
Code Issues Packages Projects Releases Wiki Activity
The sources of the Free Pascal compiler, RTL, packages and utilities. See https://www.freepascal.org/ for more info.
54,924 Commits 100 Branches 75 Tags 311 MiB
Pascal 89%
Makefile 9.7%
WebIDL 0.5%
Assembly 0.2%
AngelScript 0.1%
74aff88586
Go to file
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
compiler --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
installer --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
packages --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
rtl --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
tests --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
utils --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
.gitattributes Merged revision(s) 48972, 49057 from trunk: 2021-05-01 15:48:45 +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 --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
Makefile.fpc --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00