paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-24 09:39:11 +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,790 Commits 100 Branches 75 Tags 292 MiB
Pascal 89%
Makefile 9.7%
WebIDL 0.5%
Assembly 0.2%
AngelScript 0.1%
0412d28156
Go to file
marco 0412d28156 --- Merging r33711 into '.': 
U    rtl/nativent/Makefile.fpc
U    rtl/nativent/buildrtl.pp
A    rtl/nativent/dos.pp
--- Recording mergeinfo for merge of r33711 into '.':
 U   .
--- Merging r33712 into '.':
C    rtl/nativent/Makefile.fpc
--- Recording mergeinfo for merge of r33712 into '.':
 G   .
Summary of conflicts:
  Text conflicts: 1

# revisions: 33711,33712

git-svn-id: branches/fixes_3_0@33868 -
2016-06-01 15:11:59 +00:00
compiler --- Merging r32845 into '.': 2016-05-31 07:23:52 +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 r33429 into '.': 2016-05-30 12:31:17 +00:00
rtl --- Merging r33711 into '.': 2016-06-01 15:11:59 +00:00
tests --- Merging r32845 into '.': 2016-05-31 07:23:52 +00:00
utils --- Merging r32264 into '.': 2016-05-25 14:02:13 +00:00
.gitattributes --- Merging r33711 into '.': 2016-06-01 15:11:59 +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