paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-11 20:09:23 +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.
44,766 Commits 101 Branches 76 Tags 315 MiB
Pascal 89.2%
Makefile 9.3%
WebIDL 0.5%
Assembly 0.3%
AngelScript 0.1%
52e09149d1
Go to file
marco 52e09149d1 --- Merging r32336 into '.': 
C    tests/Makefile
C    tests/Makefile.fpc
--- Recording mergeinfo for merge of r32336 into '.':
 U   .
Summary of conflicts:
  Text conflicts: 2

# revisions: 32336,32357,32358,32722,32723

git-svn-id: branches/fixes_3_0@33812 -
2016-05-26 12:50:56 +00:00
compiler # revisions: 33753,33583 2016-05-22 18:13:53 +00:00
ide * merged ide copyright. 2016-01-13 09:13:54 +00:00
installer * Re-generated Makefile's 2015-10-10 20:05:14 +00:00
packages --- Merging r33761 into '.': 2016-05-26 12:47:14 +00:00
rtl * reverse merge of 33057 2016-05-25 20:38:55 +00:00
tests # revisions: 33746,33763 2016-05-25 17:58:46 +00:00
utils --- Merging r32264 into '.': 2016-05-25 14:02:13 +00:00
.gitattributes # revisions: 32067,32068,32069,32081,32082,32104,32105,32355,32798,32799 2016-05-25 20:04:11 +00:00
.gitignore * Removed empty tests directory from svn 2014-11-08 15:47:53 +00:00
fpmake_add1.inc
fpmake_proc1.inc
fpmake.pp
Makefile # revisions: 32918,32986,32960,33044,33171,33266,33296,33297,33298,33333,33335,33336,33337,33345,33348 2016-05-22 16:22:11 +00:00
Makefile.fpc # revisions: 32918,32986,32960,33044,33171,33266,33296,33297,33298,33333,33335,33336,33337,33345,33348 2016-05-22 16:22:11 +00:00