The sources of the Free Pascal compiler, RTL, packages and utilities. See https://www.freepascal.org/ for more info.
Go to file
marco ae2cab9b58 --- Merging r32726 into '.':
U    packages/fcl-net/src/cnetdb.pp
U    packages/fcl-net/fpmake.pp
--- Recording mergeinfo for merge of r32726 into '.':
 U   .
--- Merging r33094 into '.':
U    packages/fcl-net/src/ssockets.pp
--- Recording mergeinfo for merge of r33094 into '.':
 G   .
--- Merging r33166 into '.':
G    packages/fcl-net/src/ssockets.pp
--- Recording mergeinfo for merge of r33166 into '.':
 G   .
--- Merging r33332 into '.':
G    packages/fcl-net/src/cnetdb.pp
--- Recording mergeinfo for merge of r33332 into '.':
 G   .

# revisions: 32726,33094,33166,33332

git-svn-id: branches/fixes_3_0@33395 -
2016-03-31 09:32:54 +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 r32726 into '.': 2016-03-31 09:32:54 +00:00
rtl --- Merging r32946 into '.': 2016-03-31 07:56:57 +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 * 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 * 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