The sources of the Free Pascal compiler, RTL, packages and utilities. See https://www.freepascal.org/ for more info.
Go to file
marco e680d94fe1 --- Merging r40191 into '.':
U    packages/fcl-js/src/jsbase.pp
U    packages/fcl-js/src/jswriter.pp
--- Recording mergeinfo for merge of r40191 into '.':
 U   .
--- Merging r40195 into '.':
U    packages/fcl-web/examples/simpleserver/simpleserver.pas
--- Recording mergeinfo for merge of r40195 into '.':
 G   .
--- Merging r40203 into '.':
U    packages/fcl-js/src/jsscanner.pp
--- Recording mergeinfo for merge of r40203 into '.':
 G   .
--- Merging r40364 into '.':
U    packages/fcl-web/src/base/fphttpstatus.pas
U    packages/fcl-web/fpmake.pp
--- Recording mergeinfo for merge of r40364 into '.':
 G   .
--- Merging r40366 into '.':
G    packages/fcl-web/examples/simpleserver/simpleserver.pas
U    packages/fcl-web/examples/simpleserver/simpleserver.lpi
--- Recording mergeinfo for merge of r40366 into '.':
 G   .
--- Merging r40393 into '.':
U    packages/fcl-web/src/base/httproute.pp
--- Recording mergeinfo for merge of r40393 into '.':
 G   .
--- Merging r40395 into '.':
U    packages/fcl-web/src/base/fphttpclient.pp
--- Recording mergeinfo for merge of r40395 into '.':
 G   .
--- Merging r40592 into '.':
G    packages/fcl-js/src/jswriter.pp
--- Recording mergeinfo for merge of r40592 into '.':
 G   .
--- Merging r40707 into '.':
U    packages/fcl-js/tests/tcwriter.pp
G    packages/fcl-js/src/jswriter.pp
--- Recording mergeinfo for merge of r40707 into '.':
 G   .

# revisions: 40191,40195,40203,40364,40366,40393,40395,40592,40707

git-svn-id: branches/fixes_3_2@40719 -
2018-12-31 16:46:05 +00:00
compiler Merge of commits 40142, 40189 and 40347 2018-12-31 16:15:55 +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 r40191 into '.': 2018-12-31 16:46:05 +00:00
rtl --- Merging r40651 into '.': 2018-12-29 11:22:20 +00:00
tests Merge of revisions 40277 2018-12-31 15:48:08 +00:00
utils --- Merging r40076 into '.': 2018-12-31 16:37:10 +00:00
.gitattributes --- Merging r40076 into '.': 2018-12-31 16:37:10 +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