The sources of the Free Pascal compiler, RTL, packages and utilities. See https://www.freepascal.org/ for more info.
Go to file
marco 2fabf97f59 --- Merging r30918 into '.':
U    rtl/win/wininc/defines.inc
--- Recording mergeinfo for merge of r30918 into '.':
 U   .
--- Merging r30919 into '.':
A    packages/winunits-base/src/shlwapi.pp
U    packages/winunits-base/src/buildwinutilsbase.pp
U    packages/winunits-base/fpmake.pp
--- Recording mergeinfo for merge of r30919 into '.':
 G   .

# revisions: 30918,30919

git-svn-id: branches/fixes_3_0@30982 -
2015-06-05 14:10:54 +00:00
compiler --- Merging r30164 into '.': 2015-03-17 17:07:00 +00:00
ide * makefile regen and version updates. 2015-01-05 15:04:54 +00:00
installer --- Merging r29567 into '.': 2015-02-05 21:02:58 +00:00
packages --- Merging r30918 into '.': 2015-06-05 14:10:54 +00:00
rtl --- Merging r30918 into '.': 2015-06-05 14:10:54 +00:00
tests --- Merging r30047 into '.': 2015-04-12 14:20:56 +00:00
utils --- Merging r30609 into '.': 2015-05-08 23:52:11 +00:00
.gitattributes --- Merging r30918 into '.': 2015-06-05 14:10:54 +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