marco a4445c0e9f --- Merging r35565 into '.': ... U packages/fcl-json/tests/testjsonrtti.pp U packages/fcl-json/src/fpjsonrtti.pp --- Recording mergeinfo for merge of r35565 into '.': U . --- Merging r35571 into '.': U packages/fcl-passrc/src/pparser.pp U packages/fcl-passrc/tests/testpassrc.lpi A packages/fcl-passrc/tests/tcgenerics.pp U packages/fcl-passrc/tests/tctypeparser.pas U packages/fcl-passrc/tests/testpassrc.lpr --- Recording mergeinfo for merge of r35571 into '.': G . --- Merging r35574 into '.': U packages/pastojs/fpmake.pp --- Recording mergeinfo for merge of r35574 into '.': G . --- Merging r35576 into '.': U packages/fcl-js/src/jsscanner.pp --- Recording mergeinfo for merge of r35576 into '.': G . --- Merging r35577 into '.': U packages/fcl-js/tests/tcwriter.pp U packages/fcl-js/src/jswriter.pp --- Recording mergeinfo for merge of r35577 into '.': G . --- Merging r35578 into '.': U packages/fcl-passrc/src/pastree.pp --- Recording mergeinfo for merge of r35578 into '.': G . --- Merging r35579 into '.': U packages/fcl-passrc/src/pscanner.pp --- Recording mergeinfo for merge of r35579 into '.': G . --- Merging r35580 into '.': G packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r35580 into '.': G . --- Merging r35581 into '.': U packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r35581 into '.': G . --- Merging r35582 into '.': U packages/fcl-passrc/tests/tcresolver.pas --- Recording mergeinfo for merge of r35582 into '.': G . --- Merging r35583 into '.': U packages/pastojs/tests/tcmodules.pas --- Recording mergeinfo for merge of r35583 into '.': G . --- Merging r35584 into '.': U packages/fcl-passrc/tests/tcbaseparser.pas --- Recording mergeinfo for merge of r35584 into '.': G . --- Merging r35585 into '.': U packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r35585 into '.': G . --- Merging r35586 into '.': G packages/fcl-passrc/tests/testpassrc.lpr A packages/fcl-passrc/tests/tcuseanalyzer.pas G packages/fcl-passrc/tests/testpassrc.lpi A packages/fcl-passrc/src/pasuseanalyzer.pas --- Recording mergeinfo for merge of r35586 into '.': G . --- Merging r35587 into '.': U packages/pastojs/tests/testpas2js.lpi --- Recording mergeinfo for merge of r35587 into '.': G . --- Merging r35588 into '.': G packages/fcl-passrc/src/pscanner.pp --- Recording mergeinfo for merge of r35588 into '.': G . --- Merging r35591 into '.': U packages/fcl-passrc/tests/tcexprparser.pas U packages/fcl-passrc/tests/tcgenerics.pp G packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r35591 into '.': G . --- Merging r35593 into '.': U packages/fcl-passrc/tests/tcstatements.pas G packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r35593 into '.': G . --- Merging r35597 into '.': U packages/fcl-passrc/tests/tcprocfunc.pas G packages/fcl-passrc/src/pastree.pp --- Recording mergeinfo for merge of r35597 into '.': G . --- Merging r35612 into '.': G packages/fcl-passrc/tests/tcgenerics.pp G packages/fcl-passrc/src/pparser.pp G packages/fcl-passrc/src/pastree.pp --- Recording mergeinfo for merge of r35612 into '.': G . --- Merging r35613 into '.': G packages/fcl-passrc/tests/tcresolver.pas 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 r35613 into '.': G . --- Merging r35614 into '.': U packages/fcl-passrc/tests/tcuseanalyzer.pas U packages/fcl-passrc/src/pasuseanalyzer.pas --- Recording mergeinfo for merge of r35614 into '.': G . --- Merging r35615 into '.': G packages/pastojs/src/fppas2js.pp U packages/pastojs/tests/testpas2js.pp G packages/pastojs/tests/tcmodules.pas A packages/pastojs/tests/tcoptimizations.pas G packages/pastojs/tests/testpas2js.lpi --- Recording mergeinfo for merge of r35615 into '.': G . --- Merging r35616 into '.': G packages/fcl-passrc/tests/tcgenerics.pp G packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r35616 into '.': G . --- Merging r35617 into '.': G packages/fcl-passrc/tests/tcgenerics.pp G packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r35617 into '.': G . --- Merging r35621 into '.': G packages/fcl-passrc/src/pscanner.pp --- Recording mergeinfo for merge of r35621 into '.': G . --- Merging r35623 into '.': U packages/fcl-web/src/base/fpweb.pp --- Recording mergeinfo for merge of r35623 into '.': G . --- Merging r35625 into '.': U packages/fcl-passrc/tests/tcscanner.pas G packages/fcl-passrc/src/pscanner.pp --- Recording mergeinfo for merge of r35625 into '.': G . --- Merging r35631 into '.': U utils/pas2js/dist/rtl.js G packages/fcl-passrc/src/pasresolver.pp G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r35631 into '.': G . --- Merging r35633 into '.': G packages/fcl-js/src/jswriter.pp G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/src/pastree.pp G packages/fcl-passrc/src/pasresolver.pp U packages/pastojs/tests/tcconverter.pp G packages/pastojs/tests/tcmodules.pas U packages/pastojs/tests/tcoptimizations.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r35633 into '.': G . --- Merging r35635 into '.': G packages/fcl-passrc/tests/testpassrc.lpi U packages/fcl-passrc/tests/tcclasstype.pas G packages/fcl-passrc/src/pastree.pp G packages/fcl-passrc/src/pscanner.pp G packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r35635 into '.': G . --- Merging r35636 into '.': G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/tests/tcclasstype.pas G packages/fcl-passrc/src/pastree.pp G packages/fcl-passrc/src/pasresolver.pp G packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r35636 into '.': G . --- Merging r35637 into '.': G packages/fcl-passrc/tests/tcclasstype.pas G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r35637 into '.': G . --- Merging r35638 into '.': G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r35638 into '.': G . --- Merging r35639 into '.': G packages/fcl-passrc/src/pparser.pp U packages/fcl-passrc/tests/tcvarparser.pas G packages/fcl-passrc/tests/tcclasstype.pas G packages/fcl-passrc/tests/tcresolver.pas --- Recording mergeinfo for merge of r35639 into '.': G . --- Merging r35640 into '.': G packages/fcl-js/src/jswriter.pp --- Recording mergeinfo for merge of r35640 into '.': G . --- Merging r35641 into '.': G packages/fcl-passrc/tests/tcstatements.pas G packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r35641 into '.': G . --- Merging r35642 into '.': G packages/fcl-passrc/src/pasresolver.pp G packages/fcl-passrc/tests/tcresolver.pas --- Recording mergeinfo for merge of r35642 into '.': G . --- Merging r35643 into '.': G packages/pastojs/src/fppas2js.pp G packages/pastojs/tests/tcmodules.pas --- Recording mergeinfo for merge of r35643 into '.': G . --- Merging r35644 into '.': U packages/fcl-json/src/jsonconf.pp --- Recording mergeinfo for merge of r35644 into '.': G . --- Merging r35648 into '.': U packages/fcl-passrc/fpmake.pp --- Recording mergeinfo for merge of r35648 into '.': G . --- Merging r35651 into '.': G packages/fcl-js/src/jswriter.pp --- Recording mergeinfo for merge of r35651 into '.': G . --- Merging r35652 into '.': G packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r35652 into '.': G . --- Merging r35653 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r35653 into '.': G . --- Merging r35667 into '.': G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/tests/tcuseanalyzer.pas G packages/fcl-passrc/src/pastree.pp G packages/fcl-passrc/src/pasresolver.pp G packages/fcl-passrc/src/pasuseanalyzer.pas G packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r35667 into '.': G . --- Merging r35668 into '.': G packages/pastojs/tests/tcconverter.pp G packages/pastojs/tests/tcmodules.pas G packages/pastojs/tests/tcoptimizations.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r35668 into '.': G . --- Merging r35680 into '.': G packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r35680 into '.': G . --- Merging r35681 into '.': G packages/fcl-passrc/src/pasresolver.pp G packages/fcl-passrc/tests/tcresolver.pas --- Recording mergeinfo for merge of r35681 into '.': G . --- Merging r35682 into '.': G packages/fcl-passrc/src/pasuseanalyzer.pas G packages/fcl-passrc/tests/tcuseanalyzer.pas --- Recording mergeinfo for merge of r35682 into '.': G . --- Merging r35683 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r35683 into '.': G . --- Merging r35691 into '.': G packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r35691 into '.': G . --- Merging r35692 into '.': G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r35692 into '.': G . --- Merging r35693 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r35693 into '.': G . --- Merging r35694 into '.': G packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r35694 into '.': G . --- Merging r35695 into '.': G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r35695 into '.': G . --- Merging r35696 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r35696 into '.': G . --- Merging r35697 into '.': G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/tests/tcuseanalyzer.pas G packages/fcl-passrc/src/pasuseanalyzer.pas G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r35697 into '.': G . --- Merging r35702 into '.': G packages/fcl-passrc/tests/tcbaseparser.pas G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r35702 into '.': G . --- Merging r35703 into '.': G packages/fcl-passrc/tests/tcuseanalyzer.pas G packages/fcl-passrc/src/pasuseanalyzer.pas --- Recording mergeinfo for merge of r35703 into '.': G . --- Merging r35704 into '.': G packages/pastojs/src/fppas2js.pp G packages/pastojs/tests/tcmodules.pas --- Recording mergeinfo for merge of r35704 into '.': G . --- Merging r35705 into '.': G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r35705 into '.': G . --- Merging r35706 into '.': G packages/pastojs/tests/tcmodules.pas --- Recording mergeinfo for merge of r35706 into '.': G . --- Merging r35708 into '.': G packages/fcl-passrc/src/pasresolver.pp G packages/fcl-passrc/tests/tcuseanalyzer.pas --- Recording mergeinfo for merge of r35708 into '.': G . --- Merging r35709 into '.': G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r35709 into '.': G . --- Merging r35710 into '.': G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r35710 into '.': G . --- Merging r35711 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r35711 into '.': G . --- Merging r35713 into '.': G packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r35713 into '.': G . --- Merging r35714 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r35714 into '.': G . --- Merging r35715 into '.': G packages/fcl-passrc/src/pastree.pp G packages/fcl-passrc/src/pasresolver.pp G packages/fcl-passrc/src/pasuseanalyzer.pas --- Recording mergeinfo for merge of r35715 into '.': G . --- Merging r35716 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r35716 into '.': G . --- Merging r35718 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp G packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r35718 into '.': G . --- Merging r35719 into '.': G packages/pastojs/src/fppas2js.pp G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/tests/tcuseanalyzer.pas G packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r35719 into '.': G . --- Merging r35720 into '.': G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/tests/tcuseanalyzer.pas G packages/fcl-passrc/src/pasresolver.pp G packages/fcl-passrc/src/pasuseanalyzer.pas --- Recording mergeinfo for merge of r35720 into '.': G . --- Merging r35728 into '.': 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 r35728 into '.': G . --- Merging r35729 into '.': G packages/pastojs/src/fppas2js.pp G packages/pastojs/tests/tcmodules.pas --- Recording mergeinfo for merge of r35729 into '.': G . --- Merging r35731 into '.': G packages/fcl-passrc/src/pasuseanalyzer.pas G packages/fcl-passrc/src/pparser.pp G packages/fcl-passrc/src/pasresolver.pp G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/tests/tcuseanalyzer.pas --- Recording mergeinfo for merge of r35731 into '.': G . --- Merging r35732 into '.': G packages/pastojs/src/fppas2js.pp G packages/pastojs/tests/tcmodules.pas --- Recording mergeinfo for merge of r35732 into '.': G . --- Merging r35735 into '.': G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r35735 into '.': G . --- Merging r35736 into '.': G packages/pastojs/src/fppas2js.pp G packages/pastojs/tests/tcmodules.pas --- Recording mergeinfo for merge of r35736 into '.': G . --- Merging r35737 into '.': G packages/fcl-passrc/tests/tcuseanalyzer.pas --- Recording mergeinfo for merge of r35737 into '.': G . --- Merging r35738 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r35738 into '.': G . # revisions: 35565,35571,35574,35576,35577,35578,35579,35580,35581,35582,35583,35584,35585,35586,35587,35588,35591,35593,35597,35612,35613,35614,35615,35616,35617,35621,35623,35625,35631,35633,35635,35636,35637,35638,35639,35640,35641,35642,35643,35644,35648,35651,35652,35653,35667,35668,35680,35681,35682,35683,35691,35692,35693,35694,35695,35696,35697,35702,35703,35704,35705,35706,35708,35709,35710,35711,35713,35714,35715,35716,35718,35719,35720,35728,35729,35731,35732,35735,35736,35737,35738 git-svn-id: branches/fixes_3_0@35986 -		2017-04-27 19:48:42 +00:00
..
dist	--- Merging r35565 into '.':	2017-04-27 19:48:42 +00:00
samples
fpmake.pp	* version updates	2017-02-13 08:24:06 +00:00
Makefile	* version updates	2017-02-13 08:24:06 +00:00
Makefile.fpc	* version updates	2017-02-13 08:24:06 +00:00
pas2js.lpi
pas2js.pp