paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-23 20:49:43 +02:00
Code Issues Packages Projects Releases Wiki Activity
The sources of the Free Pascal compiler, RTL, packages and utilities. See https://www.freepascal.org/ for more info.
54,145 Commits 100 Branches 75 Tags 291 MiB
Pascal 89%
Makefile 9.7%
WebIDL 0.5%
Assembly 0.2%
AngelScript 0.1%
e16529a374
Go to file
marco e16529a374 --- Merging r40076 into '.': 
U    packages/pastojs/src/pas2jscompiler.pp
--- Recording mergeinfo for merge of r40076 into '.':
 U   .
--- Merging r40081 into '.':
U    packages/pastojs/tests/tcmodules.pas
U    packages/pastojs/src/fppas2js.pp
U    packages/fcl-passrc/tests/tcresolver.pas
--- Recording mergeinfo for merge of r40081 into '.':
 G   .
--- Merging r40083 into '.':
G    packages/pastojs/src/fppas2js.pp
G    packages/pastojs/tests/tcmodules.pas
--- Recording mergeinfo for merge of r40083 into '.':
 G   .
--- Merging r40084 into '.':
G    packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r40084 into '.':
 G   .
--- Merging r40085 into '.':
U    packages/pastojs/src/pas2jsfilecache.pp
G    packages/pastojs/src/pas2jscompiler.pp
--- Recording mergeinfo for merge of r40085 into '.':
 G   .
--- Merging r40101 into '.':
U    packages/pastojs/src/pas2jsfileutils.pp
U    packages/pastojs/src/pas2jsfileutilsnodejs.inc
--- Recording mergeinfo for merge of r40101 into '.':
 G   .
--- Merging r40105 into '.':
G    packages/pastojs/src/pas2jsfileutils.pp
G    packages/pastojs/src/pas2jsfilecache.pp
G    packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r40105 into '.':
 G   .
--- Merging r40106 into '.':
G    packages/pastojs/src/pas2jsfileutils.pp
--- Recording mergeinfo for merge of r40106 into '.':
 G   .
--- Merging r40107 into '.':
U    packages/pastojs/src/pas2jspparser.pp
--- Recording mergeinfo for merge of r40107 into '.':
 G   .
--- Merging r40116 into '.':
U    utils/pas2js/dist/rtl.js
--- Recording mergeinfo for merge of r40116 into '.':
 G   .
--- Merging r40126 into '.':
G    packages/pastojs/src/pas2jscompiler.pp
--- Recording mergeinfo for merge of r40126 into '.':
 G   .
--- Merging r40127 into '.':
G    packages/pastojs/tests/tcmodules.pas
G    packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r40127 into '.':
 G   .
--- Merging r40133 into '.':
G    packages/pastojs/tests/tcmodules.pas
G    packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r40133 into '.':
 G   .
--- Merging r40135 into '.':
U    packages/fcl-js/src/jssrcmap.pas
--- Recording mergeinfo for merge of r40135 into '.':
 G   .
--- Merging r40138 into '.':
G    packages/pastojs/src/pas2jsfilecache.pp
--- Recording mergeinfo for merge of r40138 into '.':
 G   .
--- Merging r40139 into '.':
G    packages/pastojs/src/pas2jscompiler.pp
--- Recording mergeinfo for merge of r40139 into '.':
 G   .
--- Merging r40140 into '.':
G    packages/pastojs/tests/tcmodules.pas
G    packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r40140 into '.':
 G   .
--- Merging r40143 into '.':
G    utils/pas2js/dist/rtl.js
--- Recording mergeinfo for merge of r40143 into '.':
 G   .
--- Merging r40146 into '.':
G    utils/pas2js/dist/rtl.js
--- Recording mergeinfo for merge of r40146 into '.':
 G   .
--- Merging r40148 into '.':
G    utils/pas2js/dist/rtl.js
--- Recording mergeinfo for merge of r40148 into '.':
 G   .
--- Merging r40151 into '.':
G    packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r40151 into '.':
 G   .
--- Merging r40152 into '.':
G    packages/pastojs/tests/tcmodules.pas
G    packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r40152 into '.':
 G   .
--- Merging r40164 into '.':
U    utils/pas2js/nodepas2js.lpi
--- Recording mergeinfo for merge of r40164 into '.':
 G   .
--- Merging r40168 into '.':
G    packages/pastojs/tests/tcmodules.pas
G    packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r40168 into '.':
 G   .
--- Merging r40175 into '.':
G    packages/pastojs/tests/tcmodules.pas
G    packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r40175 into '.':
 G   .
--- Merging r40177 into '.':
G    packages/pastojs/src/fppas2js.pp
G    packages/pastojs/tests/tcmodules.pas
U    packages/fcl-passrc/src/pastree.pp
--- Recording mergeinfo for merge of r40177 into '.':
 G   .
--- Merging r40192 into '.':
G    packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r40192 into '.':
 G   .
--- Merging r40193 into '.':
G    packages/pastojs/tests/tcmodules.pas
--- Recording mergeinfo for merge of r40193 into '.':
 G   .
--- Merging r40194 into '.':
U    packages/pastojs/src/pas2jslogger.pp
G    packages/pastojs/src/pas2jsfileutils.pp
G    packages/pastojs/src/pas2jscompiler.pp
--- Recording mergeinfo for merge of r40194 into '.':
 G   .
--- Merging r40204 into '.':
U    packages/fcl-passrc/src/pasuseanalyzer.pas
U    packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r40204 into '.':
 G   .
--- Merging r40209 into '.':
G    packages/pastojs/src/pas2jslogger.pp
--- Recording mergeinfo for merge of r40209 into '.':
 G   .
--- Merging r40210 into '.':
G    packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r40210 into '.':
 G   .
--- Merging r40211 into '.':
G    packages/pastojs/tests/tcmodules.pas
--- Recording mergeinfo for merge of r40211 into '.':
 G   .
--- Merging r40241 into '.':
U    utils/pas2js/pas2js.lpi
--- Recording mergeinfo for merge of r40241 into '.':
 G   .
--- Merging r40243 into '.':
G    utils/pas2js/pas2js.lpi
--- Recording mergeinfo for merge of r40243 into '.':
 G   .
--- Merging r40245 into '.':
U    utils/pas2js/pas2js.cfg
--- Recording mergeinfo for merge of r40245 into '.':
 G   .
--- Merging r40258 into '.':
G    utils/pas2js/pas2js.lpi
--- Recording mergeinfo for merge of r40258 into '.':
 G   .
--- Merging r40259 into '.':
G    packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r40259 into '.':
 G   .
--- Merging r40263 into '.':
U    packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r40263 into '.':
 G   .
--- Merging r40279 into '.':
U    packages/pastojs/tests/tcfiler.pas
G    packages/pastojs/tests/tcmodules.pas
G    packages/pastojs/src/pas2jspparser.pp
G    packages/pastojs/src/fppas2js.pp
U    packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r40279 into '.':
 G   .
--- Merging r40290 into '.':
G    packages/pastojs/tests/tcmodules.pas
G    packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r40290 into '.':
 G   .
--- Merging r40302 into '.':
G    packages/pastojs/tests/tcmodules.pas
G    packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r40302 into '.':
 G   .
--- Merging r40304 into '.':
U    packages/fcl-passrc/src/paswrite.pp
--- Recording mergeinfo for merge of r40304 into '.':
 G   .
--- Merging r40305 into '.':
G    packages/pastojs/src/pas2jscompiler.pp
--- Recording mergeinfo for merge of r40305 into '.':
 G   .
--- Merging r40342 into '.':
G    packages/fcl-passrc/src/pparser.pp
G    packages/fcl-passrc/src/pasresolver.pp
G    packages/fcl-passrc/src/pscanner.pp
G    packages/fcl-passrc/tests/tcresolver.pas
--- Recording mergeinfo for merge of r40342 into '.':
 G   .
--- Merging r40343 into '.':
U    packages/pastojs/src/pas2jsfiler.pp
G    packages/pastojs/src/fppas2js.pp
G    packages/pastojs/tests/tcmodules.pas
--- Recording mergeinfo for merge of r40343 into '.':
 G   .
--- Merging r40351 into '.':
U    packages/fcl-js/src/jswriter.pp
G    packages/pastojs/src/pas2jscompiler.pp
U    packages/pastojs/src/pas2jsfileutilsunix.inc
G    packages/pastojs/src/pas2jslogger.pp
G    packages/pastojs/src/pas2jsfileutils.pp
G    packages/pastojs/src/pas2jsfilecache.pp
G    packages/pastojs/src/fppas2js.pp
U    packages/pastojs/src/pas2jsfileutilswin.inc
--- Recording mergeinfo for merge of r40351 into '.':
 G   .
--- Merging r40352 into '.':
G    packages/pastojs/src/pas2jscompiler.pp
G    packages/pastojs/src/pas2jsfileutilsnodejs.inc
G    packages/fcl-js/src/jswriter.pp
--- Recording mergeinfo for merge of r40352 into '.':
 G   .
--- Merging r40353 into '.':
U    utils/pas2js/pas2jslib.lpi
--- Recording mergeinfo for merge of r40353 into '.':
 G   .
--- Merging r40354 into '.':
U    packages/pastojs/fpmake.pp
--- Recording mergeinfo for merge of r40354 into '.':
 G   .
--- Merging r40355 into '.':
G    packages/pastojs/src/pas2jsfileutilswin.inc
--- Recording mergeinfo for merge of r40355 into '.':
 G   .
--- Merging r40356 into '.':
G    packages/pastojs/src/pas2jscompiler.pp
G    packages/pastojs/src/pas2jsfileutils.pp
U    utils/pas2js/docs/translation.html
--- Recording mergeinfo for merge of r40356 into '.':
 G   .
--- Merging r40372 into '.':
G    packages/pastojs/tests/tcmodules.pas
G    packages/pastojs/src/fppas2js.pp
G    utils/pas2js/docs/translation.html
--- Recording mergeinfo for merge of r40372 into '.':
 G   .
--- Merging r40423 into '.':
G    packages/pastojs/src/pas2jscompiler.pp
G    packages/pastojs/src/pas2jsfilecache.pp
--- Recording mergeinfo for merge of r40423 into '.':
 G   .
--- Merging r40424 into '.':
G    packages/pastojs/src/pas2jscompiler.pp
--- Recording mergeinfo for merge of r40424 into '.':
 G   .
--- Merging r40426 into '.':
G    packages/fcl-passrc/src/pasresolver.pp
G    packages/fcl-passrc/src/pscanner.pp
G    packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r40426 into '.':
 G   .
--- Merging r40427 into '.':
G    packages/pastojs/fpmake.pp
G    packages/pastojs/src/pas2jscompiler.pp
A    packages/pastojs/src/pas2jspcucompiler.pp
G    packages/pastojs/src/pas2jsfilecache.pp
--- Recording mergeinfo for merge of r40427 into '.':
 G   .
--- Merging r40428 into '.':
U    packages/pastojs/tests/tcunitsearch.pas
U    packages/pastojs/tests/testpas2js.lpi
--- Recording mergeinfo for merge of r40428 into '.':
 G   .
--- Merging r40429 into '.':
G    packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r40429 into '.':
 G   .
--- Merging r40430 into '.':
G    packages/pastojs/src/pas2jscompiler.pp
U    packages/pastojs/src/pas2jspcucompiler.pp
G    packages/pastojs/src/pas2jsfilecache.pp
--- Recording mergeinfo for merge of r40430 into '.':
 G   .
--- Merging r40439 into '.':
G    packages/pastojs/src/pas2jscompiler.pp
G    packages/pastojs/src/pas2jspcucompiler.pp
G    packages/pastojs/src/pas2jsfilecache.pp
--- Recording mergeinfo for merge of r40439 into '.':
 G   .
--- Merging r40440 into '.':
G    packages/pastojs/src/pas2jscompiler.pp
G    packages/pastojs/src/pas2jsfilecache.pp
--- Recording mergeinfo for merge of r40440 into '.':
 G   .
--- Merging r40441 into '.':
G    packages/pastojs/src/pas2jspcucompiler.pp
--- Recording mergeinfo for merge of r40441 into '.':
 G   .

# revisions: 40076,40081,40083,40084,40085,40101,40105,40106,40107,40116,40126,40127,40133,40135,40138,40139,40140,40143,40146,40148,40151,40152,40164,40168,40175,40177,40192,40193,40194,40204,40209,40210,40211,40241,40243,40245,40258,40259,40263,40279,40290,40302,40304,40305,40342,40343,40351,40352,40353,40354,40355,40356,40372,40423,40424,40426,40427,40428,40429,40430,40439,40440,40441

git-svn-id: branches/fixes_3_2@40718 -
2018-12-31 16:37:10 +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 r40076 into '.': 2018-12-31 16:37:10 +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