The sources of the Free Pascal compiler, RTL, packages and utilities. See https://www.freepascal.org/ for more info.
Go to file
joost 7460d4d61f --- Merging r32143 into '.':
U    packages/hash/fpmake.pp
--- Recording mergeinfo for merge of r32143 into '.':
 U   .
--- Merging r32144 into '.':
U    packages/rtl-extra/fpmake.pp
--- Recording mergeinfo for merge of r32144 into '.':
 G   .
--- Merging r32145 into '.':
U    packages/fcl-registry/fpmake.pp
--- Recording mergeinfo for merge of r32145 into '.':
 G   .
--- Merging r32146 into '.':
U    packages/gtk2/fpmake.pp
--- Recording mergeinfo for merge of r32146 into '.':
 G   .
--- Merging r32147 into '.':
U    packages/winunits-jedi/fpmake.pp
--- Recording mergeinfo for merge of r32147 into '.':
 G   .

# revisions: 32143,32144,32145,32146,32147

git-svn-id: branches/fixes_3_0@32243 -
2015-11-04 21:22:21 +00:00
compiler --- Merging r31362 into '.': 2015-11-04 20:20:37 +00:00
ide --- Merging r32142 into '.': 2015-11-04 21:17:00 +00:00
installer * Re-generated Makefile's 2015-10-10 20:05:14 +00:00
packages --- Merging r32143 into '.': 2015-11-04 21:22:21 +00:00
rtl --- Merging r31362 into '.': 2015-11-04 20:20:37 +00:00
tests * Re-generated Makefile's 2015-10-10 20:05:14 +00:00
utils --- Merging r32071 into '.': 2015-11-04 20:54:34 +00:00
.gitattributes --- Merging r31362 into '.': 2015-11-04 20:20:37 +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 * Re-generated Makefile's 2015-10-10 20:05:14 +00:00
Makefile.fpc --- Merging r31308 into '.': 2015-09-06 17:20:15 +00:00