The sources of the Free Pascal compiler, RTL, packages and utilities. See https://www.freepascal.org/ for more info.
Go to file
marco 2b6c1e12fc --- Merging r30260 into '.':
U    packages/fcl-json/src/jsonconf.pp
--- Recording mergeinfo for merge of r30260 into '.':
 U   .
--- Merging r30294 into '.':
U    packages/fcl-res/src/versionresource.pp
--- Recording mergeinfo for merge of r30294 into '.':
 G   .
--- Merging r30303 into '.':
U    packages/fcl-process/src/simpleipc.pp
--- Recording mergeinfo for merge of r30303 into '.':
 G   .
--- Merging r30304 into '.':
U    packages/fcl-process/src/unix/simpleipc.inc
--- Recording mergeinfo for merge of r30304 into '.':
 G   .

# revisions: 30260,30294,30303,30304

git-svn-id: branches/fixes_3_0@31111 -
2015-06-18 08:00:19 +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 r30260 into '.': 2015-06-18 08:00:19 +00:00
rtl --- Merging r30145 into '.': 2015-06-18 07:07:10 +00:00
tests --- Merging r30653 into '.': 2015-06-17 11:23:29 +00:00
utils --- Merging r29422 through r29424 into '.': 2015-06-17 19:26:25 +00:00
.gitattributes --- Merging r29422 through r29424 into '.': 2015-06-17 19:26:25 +00:00
.gitignore * Removed empty tests directory from svn 2014-11-08 15:47:53 +00:00
fpmake_add1.inc * Handle the location of each package at run-time, not at compilation time 2013-06-02 17:55:23 +00:00
fpmake_proc1.inc * Handle the location of each package at run-time, not at compilation time 2013-06-02 17:55:23 +00:00
fpmake.pp * Handle the location of each package at run-time, not at compilation time 2013-06-02 17:55:23 +00:00
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