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 -
U packages/fcl-passrc/tests/tcexprparser.pas
U packages/fcl-passrc/tests/tctypeparser.pas
U packages/fcl-passrc/tests/tcresolver.pas
U packages/fcl-passrc/src/pparser.pp
U packages/fcl-passrc/src/pastree.pp
U packages/fcl-passrc/src/pasresolver.pp
U packages/fcl-passrc/src/pscanner.pp
U packages/pastojs/tests/tcconverter.pp
--- Recording mergeinfo for merge of r34555 into '.':
U .
--- Merging r34569 into '.':
G packages/pastojs/tests/tcconverter.pp
U packages/fcl-passrc/tests/tcbaseparser.pas
U packages/fcl-passrc/tests/tcclasstype.pas
U packages/fcl-passrc/tests/tcstatements.pas
G packages/fcl-passrc/tests/tcresolver.pas
G packages/fcl-passrc/src/pastree.pp
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 r34569 into '.':
G .
--- Merging r34631 into '.':
G packages/fcl-passrc/src/pastree.pp
G packages/fcl-passrc/src/pasresolver.pp
G packages/fcl-passrc/src/pparser.pp
G packages/fcl-passrc/tests/tcresolver.pas
--- Recording mergeinfo for merge of r34631 into '.':
G .
--- Merging r34668 into '.':
G packages/fcl-passrc/src/pastree.pp
G packages/fcl-passrc/src/pparser.pp
G packages/fcl-passrc/tests/tctypeparser.pas
U packages/fcl-passrc/tests/tcprocfunc.pas
U packages/fcl-passrc/tests/testpassrc.lpi
G packages/fcl-passrc/tests/tcclasstype.pas
--- Recording mergeinfo for merge of r34668 into '.':
G .
--- Merging r34671 into '.':
G packages/fcl-passrc/src/pscanner.pp
G packages/fcl-passrc/src/pparser.pp
G packages/fcl-passrc/tests/tcclasstype.pas
U packages/fcl-passrc/tests/tcscanner.pas
U packages/fcl-passrc/tests/tcvarparser.pas
G packages/fcl-passrc/tests/testpassrc.lpi
--- Recording mergeinfo for merge of r34671 into '.':
G .
--- Merging r34672 into '.':
G packages/fcl-passrc/src/pparser.pp
G packages/fcl-passrc/tests/testpassrc.lpi
G packages/fcl-passrc/tests/tcstatements.pas
G packages/fcl-passrc/tests/tctypeparser.pas
--- Recording mergeinfo for merge of r34672 into '.':
G .
--- Merging r34674 into '.':
G packages/fcl-passrc/tests/testpassrc.lpi
G packages/fcl-passrc/tests/tctypeparser.pas
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r34674 into '.':
G .
--- Merging r34675 into '.':
G packages/fcl-passrc/tests/tctypeparser.pas
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r34675 into '.':
G .
--- Merging r34676 into '.':
U utils/fpdoc/makeskel.pp
--- Recording mergeinfo for merge of r34676 into '.':
G .
--- Merging r34687 into '.':
G packages/fcl-passrc/tests/tctypeparser.pas
G packages/fcl-passrc/tests/tcstatements.pas
G packages/fcl-passrc/src/pastree.pp
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r34687 into '.':
G .
--- Merging r34688 into '.':
G packages/fcl-passrc/src/pparser.pp
G packages/fcl-passrc/tests/tctypeparser.pas
--- Recording mergeinfo for merge of r34688 into '.':
G .
--- Merging r34689 into '.':
G packages/fcl-passrc/tests/tcprocfunc.pas
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r34689 into '.':
G .
--- Merging r34690 into '.':
G packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r34690 into '.':
G .
--- Merging r34691 into '.':
G packages/fcl-passrc/src/pparser.pp
G packages/fcl-passrc/tests/tcexprparser.pas
--- Recording mergeinfo for merge of r34691 into '.':
G .
--- Merging r34694 into '.':
G utils/fpdoc/makeskel.pp
--- Recording mergeinfo for merge of r34694 into '.':
G .
--- Merging r34699 into '.':
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r34699 into '.':
G .
--- Merging r34700 into '.':
G packages/fcl-passrc/src/pastree.pp
--- Recording mergeinfo for merge of r34700 into '.':
G .
--- Merging r34709 into '.':
G packages/fcl-passrc/tests/testpassrc.lpi
G packages/fcl-passrc/tests/tcresolver.pas
G packages/fcl-passrc/src/pastree.pp
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 r34709 into '.':
G .
--- Merging r34716 into '.':
G packages/fcl-passrc/tests/tcresolver.pas
G packages/fcl-passrc/src/pparser.pp
G packages/fcl-passrc/src/pastree.pp
G packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r34716 into '.':
G .
--- Merging r34739 into '.':
U packages/fcl-passrc/src/readme.txt
--- Recording mergeinfo for merge of r34739 into '.':
G .
--- Merging r34749 into '.':
U utils/fpdoc/fpdocxmlopts.pas
U utils/fpdoc/mkfpdoc.pp
U utils/fpdoc/dglobals.pp
U utils/fpdoc/fpdoc.pp
--- Recording mergeinfo for merge of r34749 into '.':
G .
--- Merging r34750 into '.':
G packages/fcl-passrc/tests/tcprocfunc.pas
G packages/fcl-passrc/src/pastree.pp
--- Recording mergeinfo for merge of r34750 into '.':
G .
--- Merging r34751 into '.':
G packages/fcl-passrc/src/pastree.pp
--- Recording mergeinfo for merge of r34751 into '.':
G .
--- Merging r34752 into '.':
U utils/fpdoc/dwlinear.pp
U utils/fpdoc/dw_ipflin.pas
--- Recording mergeinfo for merge of r34752 into '.':
G .
--- Merging r34753 into '.':
G packages/fcl-passrc/tests/tcscanner.pas
G packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r34753 into '.':
G .
--- Merging r34754 into '.':
G packages/fcl-passrc/src/pscanner.pp
G packages/fcl-passrc/src/pparser.pp
G packages/fcl-passrc/src/pastree.pp
G packages/fcl-passrc/tests/tcscanner.pas
G packages/fcl-passrc/tests/tcbaseparser.pas
G packages/fcl-passrc/tests/tcclasstype.pas
--- Recording mergeinfo for merge of r34754 into '.':
G .
--- Merging r34756 into '.':
G packages/fcl-passrc/tests/tcscanner.pas
G packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r34756 into '.':
G .
--- Merging r34759 into '.':
G packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r34759 into '.':
G .
# revisions: 34555,34569,34631,34668,34671,34672,34674,34675,34676,34687,34688,34689,34690,34691,34694,34699,34700,34709,34716,34739,34749,34750,34751,34752,34753,34754,34756,34759
git-svn-id: branches/fixes_3_0@35978 -
U packages/pastojs/tests/tcconverter.pp
U packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r34430 into '.':
U .
--- Merging r34466 into '.':
U packages/fcl-web/src/base/custfcgi.pp
--- Recording mergeinfo for merge of r34466 into '.':
G .
--- Merging r34470 into '.':
U packages/fcl-web/src/base/httpdefs.pp
--- Recording mergeinfo for merge of r34470 into '.':
G .
--- Merging r34520 into '.':
G packages/pastojs/src/fppas2js.pp
G packages/pastojs/tests/tcconverter.pp
U packages/pastojs/tests/testpas2js.pp
A packages/pastojs/tests/tcmodules.pas
U packages/fcl-js/tests/testjs.lpr
U packages/fcl-js/tests/tcwriter.pp
U packages/fcl-js/src/jswriter.pp
U packages/fcl-js/src/jstree.pp
U packages/fcl-passrc/tests/tctypeparser.pas
U packages/fcl-passrc/tests/tcresolver.pas
U packages/fcl-passrc/src/pastree.pp
U packages/fcl-passrc/src/pasresolver.pp
U packages/fcl-passrc/src/pscanner.pp
U packages/fcl-passrc/src/pparser.pp
U utils/fpdoc/dw_html.pp
--- Recording mergeinfo for merge of r34520 into '.':
G .
--- Merging r34535 into '.':
U packages/fcl-json/src/jsonscanner.pp
--- Recording mergeinfo for merge of r34535 into '.':
G .
--- Merging r34536 into '.':
U packages/fcl-json/tests/testjsonparser.pp
U packages/fcl-json/src/jsonparser.pp
--- Recording mergeinfo for merge of r34536 into '.':
G .
--- Merging r34537 into '.':
U packages/fcl-json/src/fpjson.pp
--- Recording mergeinfo for merge of r34537 into '.':
G .
--- Merging r34538 into '.':
U packages/fcl-json/tests/testjsondata.pp
G packages/fcl-json/tests/testjsonparser.pp
U packages/fcl-json/tests/testjsonrtti.pp
U packages/fcl-json/src/fpjsonrtti.pp
G packages/fcl-json/src/jsonscanner.pp
G packages/fcl-json/src/jsonparser.pp
--- Recording mergeinfo for merge of r34538 into '.':
G .
--- Merging r34651 into '.':
U packages/fcl-js/src/jsbase.pp
U packages/fcl-js/src/jsparser.pp
G packages/fcl-js/src/jswriter.pp
G packages/fcl-js/src/jstree.pp
U packages/fcl-js/src/jstoken.pp
--- Recording mergeinfo for merge of r34651 into '.':
G .
--- Merging r34652 into '.':
A packages/fcl-js/src/jsminifier.pp
A packages/fcl-js/examples
A packages/fcl-js/examples/fpjsmin.pp
U packages/fcl-js/fpmake.pp
--- Recording mergeinfo for merge of r34652 into '.':
G .
--- Merging r34654 into '.':
G packages/fcl-js/fpmake.pp
--- Recording mergeinfo for merge of r34654 into '.':
G .
# revisions: 34430,34466,34470,34520,34535,34536,34537,34538,34651,34652,34654
git-svn-id: branches/fixes_3_0@35977 -
U packages/fcl-passrc/fpmake.pp
A packages/fcl-passrc/tests/tcresolver.pas
U packages/fcl-passrc/tests/testpassrc.lpi
U packages/fcl-passrc/tests/tcbaseparser.pas
U packages/fcl-passrc/tests/tcstatements.pas
U packages/fcl-passrc/tests/tcscanner.pas
U packages/fcl-passrc/tests/tcexprparser.pas
U packages/fcl-passrc/tests/tctypeparser.pas
U packages/fcl-passrc/tests/testpassrc.lpr
U packages/fcl-passrc/tests/tconstparser.pas
U packages/fcl-passrc/src/pparser.pp
U packages/fcl-passrc/src/pastree.pp
A packages/fcl-passrc/src/pasresolver.pp
U packages/fcl-passrc/src/pscanner.pp
U packages/pastojs/tests/tcconverter.pp
U packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r34357 into '.':
U .
--- Merging r34429 into '.':
G packages/fcl-passrc/tests/tctypeparser.pas
U packages/fcl-passrc/tests/tcresolver.pas
G packages/fcl-passrc/tests/tcbaseparser.pas
G packages/fcl-passrc/tests/tcstatements.pas
G packages/fcl-passrc/src/pparser.pp
G packages/fcl-passrc/src/pastree.pp
U packages/fcl-passrc/src/pasresolver.pp
G packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r34429 into '.':
G .
# revisions: 34357,34429
git-svn-id: branches/fixes_3_0@35976 -
U packages/pastojs/tests/tcconverter.pp
--- Recording mergeinfo for merge of r34038 into '.':
U .
--- Merging r34065 into '.':
U packages/fcl-web/src/base/fpoauth2ini.pp
--- Recording mergeinfo for merge of r34065 into '.':
G .
--- Merging r34096 into '.':
U packages/fcl-js/src/jsbase.pp
--- Recording mergeinfo for merge of r34096 into '.':
G .
--- Merging r34196 into '.':
U packages/fcl-json/src/jsonconf.pp
--- Recording mergeinfo for merge of r34196 into '.':
G .
--- Merging r34199 into '.':
U packages/fcl-json/src/jsonscanner.pp
--- Recording mergeinfo for merge of r34199 into '.':
G .
--- Merging r34202 into '.':
U packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r34202 into '.':
G .
--- Merging r34204 into '.':
U packages/fcl-js/tests/testjs.lpr
U packages/fcl-js/src/jsparser.pp
U packages/fcl-js/src/jswriter.pp
U packages/fcl-js/src/jstree.pp
U packages/fcl-js/src/jstoken.pp
--- Recording mergeinfo for merge of r34204 into '.':
G .
--- Merging r34206 into '.':
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r34206 into '.':
G .
--- Merging r34212 into '.':
G packages/fcl-js/src/jsbase.pp
--- Recording mergeinfo for merge of r34212 into '.':
G .
--- Merging r34213 into '.':
G packages/fcl-js/src/jswriter.pp
--- Recording mergeinfo for merge of r34213 into '.':
G .
--- Merging r34215 into '.':
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r34215 into '.':
G .
--- Merging r34217 into '.':
G packages/fcl-js/src/jswriter.pp
G packages/fcl-js/src/jstree.pp
--- Recording mergeinfo for merge of r34217 into '.':
G .
--- Merging r34218 into '.':
U packages/pastojs/tests/testpas2js.lpi
G packages/pastojs/tests/tcconverter.pp
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r34218 into '.':
G .
--- Merging r34226 into '.':
U packages/fcl-js/tests/tcwriter.pp
G packages/fcl-js/src/jswriter.pp
--- Recording mergeinfo for merge of r34226 into '.':
G .
--- Merging r34227 into '.':
G packages/pastojs/src/fppas2js.pp
G packages/pastojs/tests/tcconverter.pp
--- Recording mergeinfo for merge of r34227 into '.':
G .
# revisions: 34038,34065,34096,34196,34199,34202,34204,34206,34212,34213,34215,34217,34218,34226,34227
git-svn-id: branches/fixes_3_0@35975 -
U packages/rtl-console/fpmake.pp
U packages/rtl-extra/fpmake.pp
U packages/fcl-net/fpmake.pp
U packages/fcl-process/fpmake.pp
U packages/fcl-web/fpmake.pp
U packages/fppkg/fpmake.pp
U packages/ami-extra/fpmake.pp
U packages/googleapi/fpmake.pp
U packages/fv/fpmake.pp
--- Recording mergeinfo for merge of r33481 into '.':
U .
--- Merging r33735 into '.':
U packages/fcl-web/src/base/custhttpapp.pp
U packages/fcl-web/src/base/fphttpserver.pp
--- Recording mergeinfo for merge of r33735 into '.':
G .
--- Merging r33791 into '.':
U packages/fcl-web/src/base/fpoauth2.pp
--- Recording mergeinfo for merge of r33791 into '.':
G .
--- Merging r34061 into '.':
U packages/fcl-web/src/base/restbase.pp
--- Recording mergeinfo for merge of r34061 into '.':
G .
--- Merging r34063 into '.':
U packages/fcl-web/src/base/fphttpwebclient.pp
--- Recording mergeinfo for merge of r34063 into '.':
G .
--- Merging r34064 into '.':
U packages/fcl-web/src/base/fpwebclient.pp
--- Recording mergeinfo for merge of r34064 into '.':
G .
# revisions: 33481,33735,33791,34061,34063,34064
git-svn-id: branches/fixes_3_0@35974 -
U .
--- Merging r34198 into '.':
U packages/fcl-passrc/tests/tctypeparser.pas
U packages/fcl-passrc/src/pparser.pp
U packages/fcl-passrc/src/pastree.pp
--- Recording mergeinfo for merge of r34198 into '.':
U .
--- Merging r34201 into '.':
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r34201 into '.':
G .
--- Merging r34205 into '.':
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r34205 into '.':
G .
--- Merging r34214 into '.':
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r34214 into '.':
G .
--- Merging r34225 into '.':
U packages/fcl-passrc/tests/tcmoduleparser.pas
U packages/fcl-passrc/tests/testpassrc.lpi
U packages/fcl-passrc/tests/tcstatements.pas
U packages/fcl-passrc/tests/tcpassrcutil.pas
G packages/fcl-passrc/src/pastree.pp
U packages/fcl-passrc/src/passrcutil.pp
U packages/fcl-passrc/src/pscanner.pp
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r34225 into '.':
G .
--- Merging r34237 into '.':
G packages/fcl-passrc/src/pastree.pp
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r34237 into '.':
G .
--- Merging r34241 into '.':
G packages/fcl-passrc/src/pastree.pp
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r34241 into '.':
G .
# revisions: 34169,34198,34201,34205,34214,34225,34237,34241
git-svn-id: branches/fixes_3_0@35972 -
U utils/fpdoc/fpdocclasstree.pp
U utils/fpdoc/dglobals.pp
U utils/fpdoc/fpclasschart.pp
--- Recording mergeinfo for merge of r31366 into '.':
U .
--- Merging r31367 into '.':
G utils/fpdoc/fpclasschart.pp
G utils/fpdoc/fpdocclasstree.pp
--- Recording mergeinfo for merge of r31367 into '.':
G .
--- Merging r32183 into '.':
U packages/fcl-passrc/tests/tcstatements.pas
U packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r32183 into '.':
G .
--- Merging r32360 into '.':
U utils/fpdoc/fpdoc.css
U utils/fpdoc/css.inc
--- Recording mergeinfo for merge of r32360 into '.':
G .
--- Merging r32374 into '.':
U utils/fpdoc/dw_html.pp
U utils/fpdoc/mkfpdoc.pp
G utils/fpdoc/dglobals.pp
U utils/fpdoc/fpdoc.pp
--- Recording mergeinfo for merge of r32374 into '.':
G .
--- Merging r32376 into '.':
A utils/fpdoc/examples
A utils/fpdoc/examples/gentest.sh
A utils/fpdoc/examples/project
A utils/fpdoc/examples/project/sample-project.xml
A utils/fpdoc/examples/project/readme.txt
A utils/fpdoc/examples/basedir
A utils/fpdoc/examples/basedir/readme.txt
A utils/fpdoc/examples/basedir/sample-project.xml
A utils/fpdoc/examples/simple
A utils/fpdoc/examples/simple/testunit.xml
A utils/fpdoc/examples/simple/html.bat
A utils/fpdoc/examples/simple/readme.txt
A utils/fpdoc/examples/simple/html.sh
A utils/fpdoc/examples/simple/testunit.pp
D utils/fpdoc/testunit.pp
D utils/fpdoc/testunit.xml
D utils/fpdoc/gentest.sh
--- Recording mergeinfo for merge of r32376 into '.':
G .
--- Recording mergeinfo for merge of r34113 into '.':
G .
--- Merging r34114 into '.':
U packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r34114 into '.':
G .
--- Merging r34132 into '.':
G packages/fcl-passrc/src/pscanner.pp
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r34132 into '.':
G .
--- Merging r34169 into '.':
G packages/fcl-passrc/src/pscanner.pp
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r34169 into '.':
G .
# revisions: 31366,31367,32183,32360,32374,32376,34113,34114,34132,34169
git-svn-id: branches/fixes_3_0@35971 -
U utils/fpdoc/fpclasschart.pp
C utils/fpdoc/fpdocclasstree.pp
U utils/fpdoc/dglobals.pp
--- Recording mergeinfo for merge of r31365 into '.':
U .
Summary of conflicts:
Text conflicts: 1
# revisions: 31365
git-svn-id: branches/fixes_3_0@35969 -
U rtl/inc/exeinfo.pp
--- Recording mergeinfo for merge of r33007 into '.':
U .
--- Merging r33008 into '.':
G rtl/inc/exeinfo.pp
--- Recording mergeinfo for merge of r33008 into '.':
G .
--- Merging r33561 into '.':
G rtl/inc/exeinfo.pp
--- Recording mergeinfo for merge of r33561 into '.':
G .
--- Merging r34384 into '.':
G rtl/inc/exeinfo.pp
--- Recording mergeinfo for merge of r34384 into '.':
G .
# revisions: 33007,33008,33561,34384
git-svn-id: branches/fixes_3_0@35906 -
U packages/fcl-db/src/sqldb/sqldb.pp
--- Recording mergeinfo for merge of r34573 into '.':
U .
--- Merging r34605 into '.':
U packages/fcl-db/src/sqldb/odbc/odbcconn.pas
--- Recording mergeinfo for merge of r34605 into '.':
G .
--- Merging r34900 into '.':
U packages/fcl-db/src/base/fields.inc
--- Recording mergeinfo for merge of r34900 into '.':
G .
--- Merging r34564 into '.':
U packages/fcl-db/src/base/dsparams.inc
--- Recording mergeinfo for merge of r34564 into '.':
G .
--- Merging r34216 into '.':
U packages/dblib/src/dblib.pp
--- Recording mergeinfo for merge of r34216 into '.':
G .
--- Merging r34094 into '.':
U packages/mysql/src/mysql.inc
--- Recording mergeinfo for merge of r34094 into '.':
G .
--- Merging r34093 into '.':
U packages/fcl-db/tests/sqldbtoolsunit.pas
U packages/fcl-db/tests/toolsunit.pas
--- Recording mergeinfo for merge of r34093 into '.':
G .
--- Merging r34101 into '.':
U packages/fcl-db/tests/testfieldtypes.pas
--- Recording mergeinfo for merge of r34101 into '.':
G .
# revisions: 34573,34605,34900,34564,34216,34094,34093,34101
git-svn-id: branches/fixes_3_0@35345 -
U packages/rtl-objpas/src/inc/strutils.pp
--- Recording mergeinfo for merge of r35327 into '.':
U .
# revisions: 35327
git-svn-id: branches/fixes_3_0@35328 -
U packages/openssl/src/openssl.pas
U packages/openssl/src/fpopenssl.pp
--- Recording mergeinfo for merge of r35324 into '.':
U .
# revisions: 35324
git-svn-id: branches/fixes_3_0@35325 -
U packages/fcl-process/src/simpleipc.pp
--- Recording mergeinfo for merge of r34195 into '.':
U .
# revisions: 34195
git-svn-id: branches/fixes_3_0@35320 -
U packages/winunits-base/src/richedit.pp
--- Recording mergeinfo for merge of r33424 into '.':
U .
--- Merging r33432 into '.':
U packages/winunits-base/src/typelib.pas
--- Recording mergeinfo for merge of r33432 into '.':
G .
# revisions: 33424,33432
git-svn-id: branches/fixes_3_0@35319 -
U packages/fcl-base/src/inifiles.pp
--- Recording mergeinfo for merge of r34463 into '.':
U .
--- Merging r34477 into '.':
A packages/paszlib/tests/tczstreamseek.pp
U packages/paszlib/src/zstream.pp
--- Recording mergeinfo for merge of r34477 into '.':
G .
--- Merging r35100 into '.':
U rtl/freebsd/i386/identpatch.sh
--- Recording mergeinfo for merge of r35100 into '.':
G .
--- Merging r35193 into '.':
U rtl/gba/sysutils.pp
U rtl/nds/sysutils.pp
--- Recording mergeinfo for merge of r35193 into '.':
G .
# revisions: 34463,34477,35100,35193
git-svn-id: branches/fixes_3_0@35306 -
U packages/winunits-base/src/typelib.pas
--- Recording mergeinfo for merge of r34744 into '.':
U .
# revisions: 34744
git-svn-id: branches/fixes_3_0@35304 -
U packages/winunits-base/src/mmsystem.pp
--- Recording mergeinfo for merge of r35191 into '.':
U .
# revisions: 35191
git-svn-id: branches/fixes_3_0@35303 -
U compiler/systems/i_morph.pas
--- Recording mergeinfo for merge of r31003 into '.':
U .
--- Merging r31004 into '.':
U compiler/systems/t_morph.pas
--- Recording mergeinfo for merge of r31004 into '.':
G .
# revisions: 31003,31004
git-svn-id: branches/fixes_3_0@35302 -
U packages/amunits/src/coreunits/amigalib.pas
--- Recording mergeinfo for merge of r32704 into '.':
U .
# revisions: 32704
git-svn-id: branches/fixes_3_0@35301 -
U packages/amunits/src/coreunits/amigalib.pas
--- Recording mergeinfo for merge of r32699 into '.':
U .
# revisions: 32699
git-svn-id: branches/fixes_3_0@35300 -
C++ instead of Pascal, required by current LLDB versions (which is what
Xcode on macOS uses)
--- Merging r34558 into '.':
U compiler/dbgdwarf.pas
--- Recording mergeinfo for merge of r34558 into '.':
U .
--- Merging r34562 into '.':
G compiler/dbgdwarf.pas
C compiler/msgtxt.inc
C compiler/msgidx.inc
U compiler/globtype.pas
U compiler/msg/errore.msg
--- Recording mergeinfo for merge of r34562 into '.':
G .
git-svn-id: branches/fixes_3_0@35298 -
U rtl/freebsd/Makefile.fpc
C rtl/freebsd/Makefile
--- Recording mergeinfo for merge of r34166 into '.':
U .
Summary of conflicts:
Text conflicts: 1
# revisions: 34166
git-svn-id: branches/fixes_3_0@35273 -
C rtl/netbsd/Makefile
U rtl/netbsd/Makefile.fpc
--- Recording mergeinfo for merge of r34877 into '.':
U .
Summary of conflicts:
Text conflicts: 1
# revisions: 34877
git-svn-id: branches/fixes_3_0@34961 -
C rtl/freebsd/Makefile
U rtl/freebsd/Makefile.fpc
--- Recording mergeinfo for merge of r34876 into '.':
U .
Summary of conflicts:
Text conflicts: 1
# revisions: 34876,34877
git-svn-id: branches/fixes_3_0@34960 -
* pas2jni: Explicitly release JNI local refs while executing method pointers.
........
* pas2jni: Fixed string constant handling after recent changes in FPC.
........
* pas2jni: Fixed invoking of Java event handlers from non-main threads.
........
* pas2jni: Fixed handling of identical names of classes, proctypes when they are defined in different units.
........
* pas2jni: Removed option to create event handler by passing Java method method name as a string. It is not safe, since the target method is treated as unused by Java and the method may be removed from the resulting application.
........
* pas2jni: Reverted r34367 and mark undesired event handler creation "deprecated".
........
git-svn-id: branches/fixes_3_0@34774 -
U rtl/win/wininc/unidef.inc
U rtl/win/wininc/ascdef.inc
--- Recording mergeinfo for merge of r34571 into '.':
U .
# revisions: 34571
git-svn-id: branches/fixes_3_0@34572 -
U packages/fcl-web/src/base/fphttpclient.pp
--- Recording mergeinfo for merge of r34062 into '.':
U .
# revisions: 34062
git-svn-id: branches/fixes_3_0@34108 -
U packages/fcl-web/src/base/fphttpclient.pp
--- Recording mergeinfo for merge of r33846 into '.':
U .
# revisions: 33846
git-svn-id: branches/fixes_3_0@34107 -
U rtl/i386/int64p.inc
A tests/webtbs/tw30240.pp
--- Recording mergeinfo for merge of r34059 into '.':
U .
--- Merging r34088 into '.':
A tests/webtbs/tw30357.pp
U compiler/symtable.pas
--- Recording mergeinfo for merge of r34088 into '.':
G .
# revisions: 34059,34088
git-svn-id: branches/fixes_3_0@34103 -
A tests/webtbs/tw28713b.pp
A tests/webtbs/tw28713.pp
U compiler/nmem.pas
--- Recording mergeinfo for merge of r32602 into '.':
U .
--- Merging r33195 into '.':
G compiler/nmem.pas
--- Recording mergeinfo for merge of r33195 into '.':
git-svn-id: branches/fixes_3_0@34054 -
A tests/webtbs/tw28713b.pp
A tests/webtbs/tw28713.pp
U compiler/nmem.pas
--- Recording mergeinfo for merge of r32602 into '.':
U .
--- Merging r33195 into '.':
G compiler/nmem.pas
--- Recording mergeinfo for merge of r33195 into '.':
git-svn-id: branches/fixes_3_0@34053 -
