The sources of the Free Pascal compiler, RTL, packages and utilities. See https://www.freepascal.org/ for more info.
Go to file
marco cc2ed51356 --- Merging r34818 into '.':
U    packages/fcl-json/tests/testjsonrtti.pp
--- Recording mergeinfo for merge of r34818 into '.':
 U   .
--- Merging r34819 into '.':
U    packages/fcl-json/tests/testjsondata.pp
U    packages/fcl-json/src/fpjson.pp
--- Recording mergeinfo for merge of r34819 into '.':
 G   .
--- Merging r34851 into '.':
U    packages/pastojs/tests/tcconverter.pp
U    packages/pastojs/src/fppas2js.pp
U    packages/fcl-js/src/jsbase.pp
U    packages/fcl-js/src/jswriter.pp
U    packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r34851 into '.':
 G   .
--- Merging r34859 into '.':
G    packages/fcl-json/src/fpjson.pp
--- Recording mergeinfo for merge of r34859 into '.':
 G   .
--- Merging r34860 into '.':
G    packages/fcl-json/tests/testjsonrtti.pp
U    packages/fcl-json/tests/testjson.lpi
U    packages/fcl-json/tests/testcomps.pp
G    packages/fcl-json/tests/testjsondata.pp
--- Recording mergeinfo for merge of r34860 into '.':
 G   .
--- Merging r34869 into '.':
U    packages/fcl-json/src/jsonscanner.pp
U    packages/fcl-json/src/jsonparser.pp
--- Recording mergeinfo for merge of r34869 into '.':
 G   .
--- Merging r34870 into '.':
U    packages/fcl-json/src/jsonconf.pp
U    packages/fcl-json/tests/jsonconftest.pp
--- Recording mergeinfo for merge of r34870 into '.':
 G   .
--- Merging r34875 into '.':
U    packages/fcl-web/src/base/fphttpclient.pp
A    packages/fcl-web/examples/httpclient/keepalive.pp
A    packages/fcl-web/examples/httpclient/keepalive.lpi
--- Recording mergeinfo for merge of r34875 into '.':
 G   .
--- Merging r35022 into '.':
U    packages/rtl-extra/src/unix/clocale.pp
U    packages/pastojs/tests/tcmodules.pas
G    packages/pastojs/src/fppas2js.pp
G    packages/fcl-js/src/jswriter.pp
U    packages/fcl-js/src/jstree.pp
--- Recording mergeinfo for merge of r35022 into '.':
 G   .
--- Merging r35023 into '.':
G    packages/pastojs/tests/tcmodules.pas
G    packages/pastojs/src/fppas2js.pp
G    packages/fcl-js/src/jswriter.pp
G    packages/fcl-js/src/jstree.pp
G    packages/rtl-extra/src/unix/clocale.pp
--- Recording mergeinfo for merge of r35023 into '.':
 G   .
--- Merging r35055 into '.':
G    packages/fcl-js/src/jswriter.pp
U    packages/fcl-js/src/jstree.pp
G    packages/pastojs/src/fppas2js.pp
U    packages/pastojs/tests/tcmodules.pas
--- Recording mergeinfo for merge of r35055 into '.':
 G   .
--- Merging r35121 into '.':
U    packages/fpgtk/src/fpgtkext.pp
U    packages/fpmkunit/src/fpmkunit.pp
U    packages/fcl-web/src/base/iniwebsession.pp
U    packages/winunits-base/src/commctrl.pp
U    packages/winunits-base/src/dwmapi.pp
U    packages/winunits-jedi/src/jwawinwlx.pas
U    packages/winunits-jedi/src/jwawinbase.pas
U    packages/winunits-jedi/src/jwaimagehlp.pas
U    packages/winunits-jedi/src/jwawinioctl.pas
--- Recording mergeinfo for merge of r35121 into '.':
 G   .
--- Merging r35166 into '.':
U    packages/fcl-js/tests/tcscanner.pp
U    packages/fcl-js/tests/tcparser.pp
U    packages/fcl-js/tests/tcwriter.pp
U    packages/fcl-js/src/jsscanner.pp
U    packages/fcl-js/src/jsparser.pp
G    packages/fcl-js/src/jswriter.pp
U    packages/fcl-passrc/src/pastree.pp
G    packages/fcl-passrc/src/pasresolver.pp
U    packages/fcl-passrc/tests/tcresolver.pas
G    packages/pastojs/tests/tcmodules.pas
--- Recording mergeinfo for merge of r35166 into '.':
 G   .

# revisions: 34818,34819,34851,34859,34860,34869,34870,34875,35022,35023,35055,35121,35166

git-svn-id: branches/fixes_3_0@35980 -
2017-04-27 16:59:34 +00:00
compiler * version updates 2017-02-13 08:24:06 +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 r34818 into '.': 2017-04-27 16:59:34 +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 r34555 into '.': 2017-04-27 16:50:44 +00:00
.gitattributes --- Merging r34818 into '.': 2017-04-27 16:59:34 +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