The sources of the Free Pascal compiler, RTL, packages and utilities. See https://www.freepascal.org/ for more info.
Go to file
marco f7773b4776 --- Merging r35789 into '.':
U    packages/fcl-js/src/jstree.pp
--- Recording mergeinfo for merge of r35789 into '.':
 U   .
--- Merging r36007 into '.':
U    packages/pastojs/tests/tcoptimizations.pas
--- Recording mergeinfo for merge of r36007 into '.':
 G   .
--- Merging r36035 into '.':
U    packages/pastojs/src/fppas2js.pp
U    packages/pastojs/tests/tcmodules.pas
--- Recording mergeinfo for merge of r36035 into '.':
 G   .
--- Merging r36037 into '.':
G    packages/pastojs/tests/tcmodules.pas
G    packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r36037 into '.':
 G   .
--- Merging r36070 into '.':
G    packages/pastojs/tests/tcmodules.pas
--- Recording mergeinfo for merge of r36070 into '.':
 G   .
--- Merging r36235 into '.':
G    packages/fcl-js/src/jstree.pp
--- Recording mergeinfo for merge of r36235 into '.':
 G   .
--- Merging r36471 into '.':
G    packages/fcl-js/src/jstree.pp
--- Recording mergeinfo for merge of r36471 into '.':
 G   .
--- Merging r36492 into '.':
A    packages/fcl-js/tests/tcsrcmap.pas
U    packages/fcl-js/tests/testjs.lpi
U    packages/fcl-js/tests/testjs.lpr
U    packages/fcl-js/src/jswriter.pp
A    packages/fcl-js/src/jssrcmap.pas
--- Recording mergeinfo for merge of r36492 into '.':
 G   .
--- Merging r36493 into '.':
U    packages/fcl-js/src/jssrcmap.pas
--- Recording mergeinfo for merge of r36493 into '.':
 G   .
--- Merging r36494 into '.':
G    packages/fcl-js/src/jssrcmap.pas
--- Recording mergeinfo for merge of r36494 into '.':
 G   .

# revisions: 35789,36007,36035,36037,36070,36235,36471,36492,36493,36494

git-svn-id: branches/fixes_3_0@36535 -
2017-06-19 08:47:41 +00:00
compiler --- Merging r35545 into '.': 2017-05-30 11:28:15 +00:00
ide * version updates 2017-02-13 08:24:06 +00:00
installer --- Merging r32032 into '.': 2017-04-29 16:08:40 +00:00
packages --- Merging r35789 into '.': 2017-06-19 08:47:41 +00:00
rtl --- Merging r34462 into '.': 2017-06-19 07:15:28 +00:00
tests Fix problem with GNU make 4.X 2017-06-02 18:56:03 +00:00
utils --- Merging r35475 into '.': 2017-05-04 11:19:49 +00:00
.gitattributes --- Merging r35789 into '.': 2017-06-19 08:47:41 +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 * update allowed versions after question from Mattias 2017-03-03 08:26:55 +00:00
Makefile.fpc * update allowed versions after question from Mattias 2017-03-03 08:26:55 +00:00