The sources of the Free Pascal compiler, RTL, packages and utilities. See https://www.freepascal.org/ for more info.
Go to file
marco 046150ddeb --- Merging r41646 into '.':
U    packages/opengl/src/gl.pp
U    packages/opengl/src/glu.pp
U    packages/opengl/src/glut.pp
--- Recording mergeinfo for merge of r41646 into '.':
 U   .
--- Merging r41647 into '.':
G    packages/opengl/src/gl.pp
G    packages/opengl/src/glu.pp
G    packages/opengl/src/glut.pp
--- Recording mergeinfo for merge of r41647 into '.':
 G   .
--- Merging r41675 into '.':
U    compiler/systems/i_bsd.pas
--- Recording mergeinfo for merge of r41675 into '.':
 G   .
--- Merging r41695 into '.':
A    rtl/openbsd/si_impl.inc
U    rtl/openbsd/si_intf.inc
U    rtl/openbsd/si_prc.pp
U    rtl/openbsd/x86_64/si_prc.inc
--- Recording mergeinfo for merge of r41695 into '.':
 G   .
--- Merging r41696 into '.':
U    compiler/systems/t_bsd.pas
--- Recording mergeinfo for merge of r41696 into '.':
 G   .
--- Merging r41697 into '.':
G    compiler/systems/t_bsd.pas
--- Recording mergeinfo for merge of r41697 into '.':
 G   .
--- Merging r41698 into '.':
G    compiler/systems/t_bsd.pas
--- Recording mergeinfo for merge of r41698 into '.':
 G   .
--- Merging r41699 into '.':
G    compiler/systems/t_bsd.pas
--- Recording mergeinfo for merge of r41699 into '.':
 G   .
--- Merging r41700 into '.':
G    compiler/systems/t_bsd.pas
--- Recording mergeinfo for merge of r41700 into '.':
 G   .
--- Merging r41701 into '.':
U    rtl/openbsd/si_impl.inc
G    rtl/openbsd/si_intf.inc
G    rtl/openbsd/x86_64/si_prc.inc
--- Recording mergeinfo for merge of r41701 into '.':
 G   .

# revisions: 41646,41647,41675,41695,41696,41697,41698,41699,41700,41701

git-svn-id: branches/fixes_3_2@41985 -
2019-05-04 21:36:49 +00:00
compiler --- Merging r41646 into '.': 2019-05-04 21:36:49 +00:00
installer Merge of revisions 39726 39732 39734 39735 39736 39801 39806 39807 40002 40014 40358 40363 40392 40397 40481 40537 from trunk to fixes_3_2 2018-12-23 14:44:32 +00:00
packages --- Merging r41646 into '.': 2019-05-04 21:36:49 +00:00
rtl --- Merging r41646 into '.': 2019-05-04 21:36:49 +00:00
tests --- Merging r41243 into '.': 2019-04-27 19:21:30 +00:00
utils * fpcm and revision.inc merges. 2019-04-25 13:22:25 +00:00
.gitattributes --- Merging r41646 into '.': 2019-05-04 21:36:49 +00:00
.gitignore * made the ide a package, so it can be build in parallel with the other packages, reasons: 2018-01-06 20:22:30 +00:00
fpmake_add1.inc
fpmake_proc1.inc
fpmake.pp
Makefile * Regenerated makefiles. 2018-12-13 18:18:24 +00:00
Makefile.fpc * version to 3.2.0-beta 2018-08-18 15:25:41 +00:00