The sources of the Free Pascal compiler, RTL, packages and utilities. See https://www.freepascal.org/ for more info.
Go to file
marco fe1c92d47d --- Merging r33262 into '.':
U    rtl/haiku/sysos.inc
U    rtl/bsd/sysos.inc
U    rtl/solaris/sysos.inc
U    rtl/linux/sysos.inc
--- Recording mergeinfo for merge of r33262 into '.':
 U   .
--- Merging r33263 into '.':
U    rtl/aix/sysos.inc
--- Recording mergeinfo for merge of r33263 into '.':
 G   .
--- Merging r33291 into '.':
U    packages/fcl-image/src/fpwritebmp.pp
U    packages/fcl-image/src/fpreadbmp.pp
--- Recording mergeinfo for merge of r33291 into '.':
 G   .
--- Merging r33295 into '.':
U    packages/librsvg/fpmake.pp
--- Recording mergeinfo for merge of r33295 into '.':
 G   .

# revisions: 33262,33263,33291,33295

git-svn-id: branches/fixes_3_0@33391 -
2016-03-30 18:17:01 +00:00
compiler --- Merging r30168 into '.': 2016-03-05 19:11:10 +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 r33262 into '.': 2016-03-30 18:17:01 +00:00
rtl --- Merging r33262 into '.': 2016-03-30 18:17:01 +00:00
tests --- Merging r30168 into '.': 2016-03-05 19:11:10 +00:00
utils --- Merging r32224 into '.': 2015-11-08 17:17:50 +00:00
.gitattributes --- Merging r32812 into '.': 2016-03-28 16:48:24 +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