The sources of the Free Pascal compiler, RTL, packages and utilities. See https://www.freepascal.org/ for more info.
Go to file
marco f6f3ef904e --- Merging r31034 into '.':
C    rtl/objpas/math.pp
--- Recording mergeinfo for merge of r31034 into '.':
 U   .
Summary of conflicts:
  Text conflicts: 1

# revisions: 31034

git-svn-id: branches/fixes_3_0@31276 -
2015-08-04 09:18:45 +00:00
compiler --- Merging r29485 into '.': 2015-08-04 08:55:42 +00:00
ide --- Merging r31166 into '.': 2015-07-11 14:20:40 +00:00
installer --- Merging r29567 into '.': 2015-02-05 21:02:58 +00:00
packages --- Merging r31146 into '.': 2015-08-04 09:13:52 +00:00
rtl --- Merging r31034 into '.': 2015-08-04 09:18:45 +00:00
tests --- Merging r29485 into '.': 2015-08-04 08:55:42 +00:00
utils --- Merging r31168 into '.': 2015-08-04 08:49:29 +00:00
.gitattributes --- Merging r31146 into '.': 2015-08-04 09:13:52 +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