The sources of the Free Pascal compiler, RTL, packages and utilities. See https://www.freepascal.org/ for more info.
Go to file
marco 3605c0655a --- Merging r30653 into '.':
U    rtl/inc/fexpand.inc
--- Recording mergeinfo for merge of r30653 into '.':
 U   .
--- Merging r30654 into '.':
U    tests/test/units/dos/tfexpand.pp
--- Recording mergeinfo for merge of r30654 into '.':
 G   .
--- Merging r30774 into '.':
G    tests/test/units/dos/tfexpand.pp
--- Recording mergeinfo for merge of r30774 into '.':
 G   .
--- Merging r30788 into '.':
U    rtl/amiga/system.pp
--- Recording mergeinfo for merge of r30788 into '.':
 G   .
--- Merging r30789 into '.':
U    rtl/morphos/system.pp
--- Recording mergeinfo for merge of r30789 into '.':
 G   .
--- Merging r30790 into '.':
U    packages/fcl-process/fpmake.pp
A    packages/fcl-process/src/amicommon
A    packages/fcl-process/src/amicommon/process.inc
A    packages/fcl-process/src/amicommon/pipes.inc
A    packages/fcl-process/src/amicommon/simpleipc.inc
--- Recording mergeinfo for merge of r30790 into '.':
 G   .
--- Merging r30803 into '.':
U    packages/fcl-process/src/amicommon/simpleipc.inc
--- Recording mergeinfo for merge of r30803 into '.':
 G   .
--- Merging r30805 into '.':
U    packages/fcl-process/src/amicommon/process.inc
U    packages/fcl-process/src/amicommon/pipes.inc
--- Recording mergeinfo for merge of r30805 into '.':
 G   .
--- Merging r30806 into '.':
G    packages/fcl-process/src/amicommon/process.inc
G    packages/fcl-process/src/amicommon/pipes.inc
--- Recording mergeinfo for merge of r30806 into '.':
 G   .
--- Merging r30812 into '.':
U    packages/morphunits/src/amigados.pas
U    packages/amunits/src/coreunits/amigados.pas
G    packages/fcl-process/src/amicommon/process.inc
G    packages/fcl-process/src/amicommon/pipes.inc
U    packages/arosunits/src/amigados.pas
--- Recording mergeinfo for merge of r30812 into '.':
 G   .
--- Merging r30813 into '.':
U    rtl/aros/system.pp
--- Recording mergeinfo for merge of r30813 into '.':
 G   .

# revisions: 30653,30654,30774,30788,30789,30790,30803,30805,30806,30812,30813

git-svn-id: branches/fixes_3_0@31082 -
2015-06-17 11:23:29 +00:00
compiler --- Merging r30364 into '.': 2015-06-17 11:17:16 +00:00
ide --- Recording mergeinfo for merge of r30359 into '.': 2015-06-17 08:12:01 +00:00
installer --- Merging r29567 into '.': 2015-02-05 21:02:58 +00:00
packages --- Merging r30653 into '.': 2015-06-17 11:23:29 +00:00
rtl --- Merging r30653 into '.': 2015-06-17 11:23:29 +00:00
tests --- Merging r30653 into '.': 2015-06-17 11:23:29 +00:00
utils --- Merging r29426 into '.': 2015-06-14 20:37:31 +00:00
.gitattributes --- Merging r30653 into '.': 2015-06-17 11:23:29 +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 --- Merging r29434 into '.': 2015-01-13 13:58:55 +00:00
Makefile.fpc --- Merging r29434 into '.': 2015-01-13 13:58:55 +00:00