paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-25 15:09:22 +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.
44,860 Commits 101 Branches 76 Tags 290 MiB
Pascal 89.1%
Makefile 9.6%
WebIDL 0.5%
Assembly 0.2%
AngelScript 0.1%
b300edd432
Go to file
marco b300edd432 --- Merging r35428 into '.': 
U    packages/pastojs/tests/tcconverter.pp
U    packages/pastojs/tests/tcmodules.pas
U    packages/pastojs/src/fppas2js.pp
U    packages/fcl-js/src/jstree.pp
U    packages/fcl-passrc/src/pasresolver.pp
U    packages/fcl-passrc/src/pparser.pp
U    packages/fcl-passrc/src/pastree.pp
U    packages/fcl-passrc/tests/tcresolver.pas
--- Recording mergeinfo for merge of r35428 into '.':
 U   .
--- Merging r35468 into '.':
U    packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r35468 into '.':
 G   .
--- Merging r35469 into '.':
G    packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r35469 into '.':
 G   .
--- Merging r35470 into '.':
G    packages/fcl-passrc/src/pasresolver.pp
G    packages/fcl-passrc/tests/tcresolver.pas
--- Recording mergeinfo for merge of r35470 into '.':
 G   .
--- Merging r35472 into '.':
G    packages/pastojs/tests/tcmodules.pas
G    packages/pastojs/src/fppas2js.pp
U    utils/pas2js/dist/rtl.js
--- Recording mergeinfo for merge of r35472 into '.':
 G   .
--- Merging r35487 into '.':
G    packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r35487 into '.':
 G   .
--- Merging r35488 into '.':
U    packages/fcl-passrc/tests/tcbaseparser.pas
G    packages/fcl-passrc/src/pastree.pp
G    packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r35488 into '.':
 G   .
--- Merging r35489 into '.':
G    packages/fcl-passrc/tests/tcresolver.pas
G    packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r35489 into '.':
 G   .
--- Merging r35490 into '.':
G    packages/fcl-js/src/jstree.pp
--- Recording mergeinfo for merge of r35490 into '.':
 G   .
--- Merging r35491 into '.':
G    packages/pastojs/tests/tcmodules.pas
G    packages/pastojs/src/fppas2js.pp
G    utils/pas2js/dist/rtl.js
--- Recording mergeinfo for merge of r35491 into '.':
 G   .
--- Merging r35502 into '.':
U    packages/fcl-js/src/jswriter.pp
--- Recording mergeinfo for merge of r35502 into '.':
 G   .
--- Merging r35503 into '.':
G    packages/fcl-passrc/src/pparser.pp
G    packages/fcl-passrc/src/pastree.pp
G    packages/fcl-passrc/src/pasresolver.pp
U    packages/fcl-passrc/src/passrcutil.pp
G    packages/fcl-passrc/src/pscanner.pp
U    packages/fcl-passrc/tests/tcexprparser.pas
G    packages/fcl-passrc/tests/tcresolver.pas
U    packages/fcl-passrc/tests/tcvarparser.pas
--- Recording mergeinfo for merge of r35503 into '.':
 G   .
--- Merging r35504 into '.':
G    packages/pastojs/tests/tcmodules.pas
G    packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r35504 into '.':
 G   .
--- Merging r35505 into '.':
G    utils/pas2js/dist/rtl.js
--- Recording mergeinfo for merge of r35505 into '.':
 G   .
--- Merging r35512 into '.':
U    packages/fcl-web/src/base/httpdefs.pp
--- Recording mergeinfo for merge of r35512 into '.':
 G   .
--- Merging r35513 into '.':
G    packages/fcl-web/src/base/httpdefs.pp
--- Recording mergeinfo for merge of r35513 into '.':
 G   .
--- Merging r35514 into '.':
U    packages/fcl-web/src/base/custcgi.pp
--- Recording mergeinfo for merge of r35514 into '.':
 G   .
--- Merging r35515 into '.':
U    packages/fcl-web/src/base/httproute.pp
--- Recording mergeinfo for merge of r35515 into '.':
 G   .
--- Merging r35516 into '.':
U    packages/fcl-web/src/base/fphttpclient.pp
--- Recording mergeinfo for merge of r35516 into '.':
 G   .
--- Merging r35522 into '.':
U    packages/fcl-passrc/tests/tcclasstype.pas
G    packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r35522 into '.':
 G   .
--- Merging r35524 into '.':
G    packages/fcl-passrc/src/pparser.pp
U    packages/fcl-passrc/tests/tcprocfunc.pas
--- Recording mergeinfo for merge of r35524 into '.':
 G   .
--- Merging r35561 into '.':
U    packages/fcl-json/src/fpjsonrtti.pp
U    packages/fcl-json/tests/testjsonrtti.pp
--- Recording mergeinfo for merge of r35561 into '.':
 G   .
--- Merging r35562 into '.':
G    packages/fcl-passrc/src/pscanner.pp
G    packages/fcl-passrc/src/pparser.pp
U    packages/fcl-passrc/tests/tcscanner.pas
--- Recording mergeinfo for merge of r35562 into '.':
 G   .

# revisions: 35428,35468,35469,35470,35472,35487,35488,35489,35490,35491,35502,35503,35504,35505,35512,35513,35514,35515,35516,35522,35524,35561,35562

git-svn-id: branches/fixes_3_0@35984 -
2017-04-27 17:42:06 +00:00
compiler --- Merging r34878 into '.': 2017-04-27 17:16:21 +00:00
ide * version updates 2017-02-13 08:24:06 +00:00
installer * version updates 2017-02-13 08:24:06 +00:00
packages --- Merging r35428 into '.': 2017-04-27 17:42:06 +00:00
rtl --- Merging r33007 into '.': 2017-04-22 17:19:11 +00:00
tests * version updates 2017-02-13 08:24:06 +00:00
utils --- Merging r35428 into '.': 2017-04-27 17:42:06 +00:00
.gitattributes --- Merging r35292 into '.': 2017-04-27 17:27:06 +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