The sources of the Free Pascal compiler, RTL, packages and utilities. See https://www.freepascal.org/ for more info.
Go to file
marco d6bd0750b8 --- Merging r30991 into '.':
U    rtl/morphos/system.pp
U    rtl/amicommon/sysosh.inc
U    rtl/amicommon/sysos.inc
U    rtl/amiga/system.pp
--- Recording mergeinfo for merge of r30991 into '.':
 U   .
--- Merging r30992 into '.':
U    rtl/amicommon/athreads.pp
--- Recording mergeinfo for merge of r30992 into '.':
 G   .
--- Merging r30993 into '.':
U    packages/rtl-extra/src/amiga/sockets.pp
D    packages/rtl-extra/src/morphos
U    packages/rtl-extra/fpmake.pp
--- Recording mergeinfo for merge of r30993 into '.':
 G   .
--- Merging r30994 into '.':
G    packages/rtl-extra/src/amiga/sockets.pp
--- Recording mergeinfo for merge of r30994 into '.':
 G   .
--- Merging r30995 into '.':
U    packages/morphunits/src/utility.pas
--- Recording mergeinfo for merge of r30995 into '.':
 G   .
--- Merging r30996 into '.':
U    packages/morphunits/src/exec.pas
--- Recording mergeinfo for merge of r30996 into '.':
 G   .
--- Merging r30997 into '.':
U    packages/morphunits/src/amigalib.pas
--- Recording mergeinfo for merge of r30997 into '.':
 G   .
--- Merging r30998 into '.':
U    packages/amunits/src/coreunits/exec.pas
--- Recording mergeinfo for merge of r30998 into '.':
 G   .
--- Merging r30999 into '.':
G    packages/morphunits/src/amigalib.pas
--- Recording mergeinfo for merge of r30999 into '.':
 G   .
--- Merging r31000 into '.':
G    packages/morphunits/src/exec.pas
--- Recording mergeinfo for merge of r31000 into '.':
 G   .
--- Merging r31001 into '.':
U    packages/amunits/src/coreunits/amigalib.pas
--- Recording mergeinfo for merge of r31001 into '.':
 G   .
--- Merging r31005 into '.':
U    utils/fpcres/fpmake.pp
--- Recording mergeinfo for merge of r31005 into '.':
 G   .

# revisions: 30991,30992,30993,30994,30995,30996,30997,30998,30999,31000,31001,31005

git-svn-id: branches/fixes_3_0@31097 -
2015-06-17 18:42:30 +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 r30991 into '.': 2015-06-17 18:42:30 +00:00
rtl --- Merging r30991 into '.': 2015-06-17 18:42:30 +00:00
tests --- Merging r30653 into '.': 2015-06-17 11:23:29 +00:00
utils --- Merging r30991 into '.': 2015-06-17 18:42:30 +00:00
.gitattributes --- Merging r30991 into '.': 2015-06-17 18:42:30 +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