The sources of the Free Pascal compiler, RTL, packages and utilities. See https://www.freepascal.org/ for more info.
Go to file
marco 7be5479e9e --- Merging r37135 into '.':
C    utils/fpcm/revision.inc
C    rtl/objpas/sysutils/filutil.inc
U    rtl/objpas/sysutils/filutilh.inc
U    rtl/win/sysutils.pp
U    rtl/unix/sysutils.pp
--- Recording mergeinfo for merge of r37135 into '.':
 U   .
Summary of conflicts:
  Text conflicts: 2

# revisions: 37135

git-svn-id: branches/fixes_3_0@37138 -
2017-09-04 08:07:55 +00:00
compiler
ide
installer
packages --- Merging r36774 into '.': 2017-09-03 15:07:03 +00:00
rtl --- Merging r37135 into '.': 2017-09-04 08:07:55 +00:00
tests
utils --- Merging r36438 into '.': 2017-09-03 15:20:25 +00:00
.gitattributes copied to fixes 2017-09-03 12:26:27 +00:00
.gitignore
fpmake_add1.inc
fpmake_proc1.inc
fpmake.pp
Makefile
Makefile.fpc