The sources of the Free Pascal compiler, RTL, packages and utilities. See https://www.freepascal.org/ for more info.
Go to file
marco 0a6772ced0 --- Merging r30967 into '.':
U    packages/amunits/src/otherlibs/ahi.pas
--- Recording mergeinfo for merge of r30967 into '.':
 U   .
--- Merging r30974 into '.':
U    packages/amunits/src/otherlibs/ptreplay.pas
--- Recording mergeinfo for merge of r30974 into '.':
 G   .
--- Merging r30976 into '.':
U    packages/amunits/src/otherlibs/cybergraphics.pas
--- Recording mergeinfo for merge of r30976 into '.':
 G   .
--- Merging r30977 into '.':
U    packages/amunits/src/otherlibs/picasso96api.pas
--- Recording mergeinfo for merge of r30977 into '.':
 G   .
--- Merging r30978 into '.':
U    packages/amunits/src/utilunits/amsgbox.pas
--- Recording mergeinfo for merge of r30978 into '.':
 G   .
--- Merging r30979 into '.':
U    packages/amunits/src/coreunits/layers.pas
--- Recording mergeinfo for merge of r30979 into '.':
 G   .
--- Merging r30980 into '.':
U    packages/amunits/src/coreunits/amigados.pas
--- Recording mergeinfo for merge of r30980 into '.':
 G   .
--- Merging r30981 into '.':
U    packages/amunits/src/coreunits/exec.pas
--- Recording mergeinfo for merge of r30981 into '.':
 G   .
--- Merging r30983 into '.':
U    packages/amunits/src/coreunits/amigalib.pas
--- Recording mergeinfo for merge of r30983 into '.':
 G   .
--- Merging r30984 into '.':
U    packages/amunits/src/coreunits/intuition.pas
--- Recording mergeinfo for merge of r30984 into '.':
 G   .
--- Merging r30985 into '.':
U    packages/amunits/src/coreunits/rexx.pas
--- Recording mergeinfo for merge of r30985 into '.':
 G   .
--- Merging r30986 into '.':
U    packages/amunits/src/coreunits/utility.pas
--- Recording mergeinfo for merge of r30986 into '.':
 G   .
--- Merging r30988 into '.':
G    packages/amunits/src/coreunits/utility.pas
--- Recording mergeinfo for merge of r30988 into '.':
 G   .
--- Merging r30989 into '.':
U    packages/morphunits/src/iffparse.pas
--- Recording mergeinfo for merge of r30989 into '.':
 G   .

# revisions: 30967,30974,30976,30977,30978,30979,30980,30981,30983,30984,30985,30986,30988,30989

git-svn-id: branches/fixes_3_0@31095 -
2015-06-17 17:49:32 +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 r30967 into '.': 2015-06-17 17:49:32 +00:00
rtl * merge r30942,30958-30959,30966 2015-06-17 17:48:17 +00:00
tests --- Merging r30653 into '.': 2015-06-17 11:23:29 +00:00
utils --- Merging r29489 into '.': 2015-06-17 17:38:22 +00:00
.gitattributes --- Merging r29489 into '.': 2015-06-17 17:38:22 +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