U packages/fcl-pdf/examples/testfppdf.lpr
U packages/fcl-pdf/src/fpttf.pp
U packages/fcl-pdf/src/fppdf.pp
--- Recording mergeinfo for merge of r33998 into '.':
U .
--- Merging r34037 into '.':
D packages/fcl-pdf/utils/mkpdffontdef.lpi
D packages/fcl-pdf/utils/mkpdffontdef.pp
--- Recording mergeinfo for merge of r34037 into '.':
G .
--- Merging r34060 into '.':
U packages/fcl-pdf/tests/fpttf_test.pas
U packages/fcl-pdf/tests/fpparsettf_test.pas
U packages/fcl-pdf/src/fpparsettf.pp
G packages/fcl-pdf/src/fppdf.pp
--- Recording mergeinfo for merge of r34060 into '.':
G .
--- Merging r34543 into '.':
G packages/fcl-pdf/src/fppdf.pp
--- Recording mergeinfo for merge of r34543 into '.':
G .
--- Merging r34563 into '.':
G packages/fcl-pdf/examples/testfppdf.lpr
U packages/fcl-pdf/tests/fppdf_test.pas
G packages/fcl-pdf/src/fpparsettf.pp
G packages/fcl-pdf/src/fppdf.pp
G packages/fcl-pdf/src/fpttf.pp
--- Recording mergeinfo for merge of r34563 into '.':
G .
--- Merging r34767 into '.':
G packages/fcl-pdf/examples/testfppdf.lpr
G packages/fcl-pdf/tests/fpparsettf_test.pas
G packages/fcl-pdf/src/fpparsettf.pp
G packages/fcl-pdf/src/fppdf.pp
--- Recording mergeinfo for merge of r34767 into '.':
G .
--- Merging r34778 into '.':
G packages/fcl-pdf/src/fppdf.pp
G packages/fcl-pdf/examples/testfppdf.lpr
--- Recording mergeinfo for merge of r34778 into '.':
G .
--- Merging r34779 into '.':
G packages/fcl-pdf/src/fppdf.pp
--- Recording mergeinfo for merge of r34779 into '.':
G .
--- Merging r34780 into '.':
G packages/fcl-pdf/src/fppdf.pp
--- Recording mergeinfo for merge of r34780 into '.':
G .
--- Merging r34781 into '.':
G packages/fcl-pdf/examples/testfppdf.lpr
G packages/fcl-pdf/src/fppdf.pp
--- Recording mergeinfo for merge of r34781 into '.':
G .
--- Merging r34804 into '.':
G packages/fcl-pdf/src/fppdf.pp
--- Recording mergeinfo for merge of r34804 into '.':
G .
--- Merging r35083 into '.':
G packages/fcl-pdf/examples/testfppdf.lpr
U packages/fcl-pdf/utils/ttfdump.lpr
U packages/fcl-pdf/utils/ttfdump.lpi
U packages/fcl-pdf/fpmake.pp
G packages/fcl-pdf/tests/fpparsettf_test.pas
G packages/fcl-pdf/tests/fppdf_test.pas
G packages/fcl-pdf/tests/fpttf_test.pas
A packages/fcl-pdf/src/fontmetrics_stdpdf.inc
G packages/fcl-pdf/src/fpparsettf.pp
G packages/fcl-pdf/src/fppdf.pp
G packages/fcl-pdf/src/fpttf.pp
--- Recording mergeinfo for merge of r35083 into '.':
G .
--- Merging r35084 into '.':
A packages/fcl-pdf/src/fpttfsubsetter.pp
G packages/fcl-pdf/fpmake.pp
--- Recording mergeinfo for merge of r35084 into '.':
G .
--- Merging r35090 into '.':
G packages/fcl-pdf/fpmake.pp
A packages/fcl-pdf/src/fpfonttextmapping.pp
--- Recording mergeinfo for merge of r35090 into '.':
G .
--- Merging r35094 into '.':
U packages/fcl-pdf/src/fpttfsubsetter.pp
--- Recording mergeinfo for merge of r35094 into '.':
G .
--- Merging r35126 into '.':
G packages/fcl-pdf/utils/ttfdump.lpi
G packages/fcl-pdf/src/fppdf.pp
G packages/fcl-pdf/src/fpttfsubsetter.pp
G packages/fcl-pdf/examples/testfppdf.lpr
--- Recording mergeinfo for merge of r35126 into '.':
G .
--- Merging r35131 into '.':
G packages/fcl-pdf/src/fppdf.pp
G packages/fcl-pdf/src/fpttfsubsetter.pp
--- Recording mergeinfo for merge of r35131 into '.':
G .
--- Merging r35519 into '.':
G packages/fcl-pdf/src/fpttfsubsetter.pp
--- Recording mergeinfo for merge of r35519 into '.':
G .
# revisions: 33998,34037,34060,34543,34563,34767,34778,34779,34780,34781,34804,35083,35084,35090,35094,35126,35131,35519
git-svn-id: branches/fixes_3_0@36010 -
U packages/ptc/src/dos/timeunit/timeunit.pp
--- Recording mergeinfo for merge of r35752 into '.':
U .
# revisions: 35752
git-svn-id: branches/fixes_3_0@36009 -
U packages/sqlite/src/sqlite3.inc
--- Recording mergeinfo for merge of r34618 into '.':
U .
--- Merging r34867 into '.':
U packages/odbc/src/odbcsql.inc
--- Recording mergeinfo for merge of r34867 into '.':
G .
# revisions: 34618,34867
git-svn-id: branches/fixes_3_0@36008 -
U rtl/beos/sysos.inc
U rtl/haiku/sysos.inc
U rtl/bsd/sysos.inc
U rtl/solaris/signal.inc
U rtl/aix/signal.inc
U rtl/go32v2/dpmiexcp.pp
U rtl/linux/sysos.inc
U rtl/netware/nwcalls.pp
U rtl/inc/system.inc
U rtl/inc/text.inc
U rtl/inc/lineinfo.pp
U rtl/objpas/classes/reader.inc
U rtl/wince/wininc/struct.inc
U rtl/java/jsystem.inc
--- Recording mergeinfo for merge of r35130 into '.':
U .
--- Merging r35792 into '.':
U rtl/win/wininc/redef.inc
--- Recording mergeinfo for merge of r35792 into '.':
G .
# revisions: 35130,35792
git-svn-id: branches/fixes_3_0@36005 -
C packages/fpmkunit/src/fpmkunit.pp
U packages/sdl/fpmake.pp
U packages/rtl-objpas/fpmake.pp
U packages/rtl-extra/fpmake.pp
U packages/libgd/src/gd.pas
U packages/rtl-unicode/fpmake.pp
U rtl/nds/rtl.cfg
--- Recording mergeinfo for merge of r30083 into '.':
U .
Summary of conflicts:
Text conflicts: 1
# revisions: 30083
git-svn-id: branches/fixes_3_0@36002 -
U packages/fcl-base/src/custapp.pp
--- Recording mergeinfo for merge of r35877 into '.':
U .
--- Merging r35893 into '.':
G packages/fcl-base/src/custapp.pp
--- Recording mergeinfo for merge of r35893 into '.':
G .
--- Merging r35894 into '.':
U packages/fcl-base/examples/testapp.pp
--- Recording mergeinfo for merge of r35894 into '.':
G .
# revisions: 35877,35893,35894
git-svn-id: branches/fixes_3_0@36001 -
U packages/fcl-base/src/streamex.pp
--- Recording mergeinfo for merge of r34727 into '.':
U .
--- Merging r34728 into '.':
G packages/fcl-base/src/streamex.pp
--- Recording mergeinfo for merge of r34728 into '.':
G .
--- Merging r34748 into '.':
U packages/fcl-base/src/fptimer.pp
--- Recording mergeinfo for merge of r34748 into '.':
G .
--- Merging r34988 into '.':
U packages/fcl-base/src/syncobjs.pp
--- Recording mergeinfo for merge of r34988 into '.':
G .
# revisions: 34727,34728,34748,34988
git-svn-id: branches/fixes_3_0@36000 -
U packages/fcl-base/src/custapp.pp
--- Recording mergeinfo for merge of r33772 into '.':
U .
--- Merging r34294 into '.':
U packages/fcl-base/fpmake.pp
--- Recording mergeinfo for merge of r34294 into '.':
G .
--- Merging r34467 into '.':
U packages/fcl-base/src/inifiles.pp
--- Recording mergeinfo for merge of r34467 into '.':
G .
--- Merging r34500 into '.':
G packages/fcl-base/src/custapp.pp
--- Recording mergeinfo for merge of r34500 into '.':
G .
# revisions: 33772,34294,34467,34500
git-svn-id: branches/fixes_3_0@35999 -
U packages/fcl-db/src/base/dsparams.inc
--- Recording mergeinfo for merge of r34244 into '.':
U .
--- Merging r34556 into '.':
U packages/dblib/src/dblib.pp
--- Recording mergeinfo for merge of r34556 into '.':
G .
--- Merging r34745 into '.':
U packages/fcl-db/tests/testspecifictbufdataset.pas
U packages/fcl-db/src/base/dataset.inc
--- Recording mergeinfo for merge of r34745 into '.':
G .
--- Merging r35465 into '.':
U packages/fcl-db/fpmake.pp
--- Recording mergeinfo for merge of r35465 into '.':
G .
--- Merging r35618 into '.':
U packages/fcl-db/src/base/bufdataset.pas
--- Recording mergeinfo for merge of r35618 into '.':
G .
--- Merging r35628 into '.':
G packages/fcl-db/src/base/dataset.inc
--- Recording mergeinfo for merge of r35628 into '.':
G .
--- Merging r35629 into '.':
U packages/fcl-db/tests/testdbbasics.pas
--- Recording mergeinfo for merge of r35629 into '.':
G .
--- Merging r35630 into '.':
U packages/fcl-db/src/Dataset.txt
--- Recording mergeinfo for merge of r35630 into '.':
G .
--- Merging r35690 into '.':
U packages/fcl-db/src/sqldb/sqldb.pp
--- Recording mergeinfo for merge of r35690 into '.':
G .
# revisions: 34244,34556,34745,35465,35618,35628,35629,35630,35690
git-svn-id: branches/fixes_3_0@35994 -
U packages/fcl-db/src/sqldb/sqldb.pp
U packages/fcl-db/src/sqldb/mysql/mysqlconn.inc
--- Recording mergeinfo for merge of r33254 into '.':
U .
--- Merging r33420 into '.':
U packages/fcl-db/tests/testdbbasics.pas
U packages/fcl-db/src/base/bufdataset.pas
--- Recording mergeinfo for merge of r33420 into '.':
G .
--- Merging r33421 into '.':
G packages/fcl-db/src/base/bufdataset.pas
--- Recording mergeinfo for merge of r33421 into '.':
G .
--- Merging r33422 into '.':
G packages/fcl-db/src/base/bufdataset.pas
--- Recording mergeinfo for merge of r33422 into '.':
G .
--- Merging r33427 into '.':
G packages/fcl-db/src/base/bufdataset.pas
--- Recording mergeinfo for merge of r33427 into '.':
G .
--- Merging r33570 into '.':
G packages/fcl-db/src/sqldb/sqldb.pp
--- Recording mergeinfo for merge of r33570 into '.':
G .
--- Merging r33666 into '.':
U packages/fcl-db/tests/toolsunit.pas
U packages/fcl-db/tests/sqldbtoolsunit.pas
--- Recording mergeinfo for merge of r33666 into '.':
G .
--- Merging r33905 into '.':
U packages/fcl-db/src/sqldb/interbase/fbadmin.pp
--- Recording mergeinfo for merge of r33905 into '.':
G .
--- Merging r33911 into '.':
G packages/fcl-db/src/sqldb/interbase/fbadmin.pp
--- Recording mergeinfo for merge of r33911 into '.':
G .
--- Merging r33912 into '.':
G packages/fcl-db/src/sqldb/interbase/fbadmin.pp
--- Recording mergeinfo for merge of r33912 into '.':
G .
--- Merging r33913 into '.':
U packages/fcl-db/src/sqldb/interbase/fbadmin.pp
--- Recording mergeinfo for merge of r33913 into '.':
G .
--- Merging r34095 into '.':
U packages/postgres/src/postgres3dyn.pp
--- Recording mergeinfo for merge of r34095 into '.':
G .
# revisions: 33254,33420,33421,33422,33427,33570,33666,33905,33911,33912,33913,34095
git-svn-id: branches/fixes_3_0@35993 -
U packages/fcl-passrc/tests/tcresolver.pas
U packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r35883 into '.':
U .
--- Merging r35884 into '.':
U packages/fcl-passrc/src/pparser.pp
U packages/fcl-passrc/tests/tcvarparser.pas
--- Recording mergeinfo for merge of r35884 into '.':
G .
--- Merging r35887 into '.':
G packages/fcl-passrc/tests/tcresolver.pas
G packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r35887 into '.':
G .
--- Merging r35888 into '.':
U packages/pastojs/src/fppas2js.pp
U packages/pastojs/tests/tcmodules.pas
--- Recording mergeinfo for merge of r35888 into '.':
G .
--- Merging r35889 into '.':
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r35889 into '.':
G .
--- Merging r35895 into '.':
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r35895 into '.':
G .
--- Merging r35896 into '.':
U packages/fcl-passrc/tests/tcstatements.pas
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r35896 into '.':
G .
--- Merging r35897 into '.':
G packages/fcl-passrc/tests/tcstatements.pas
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r35897 into '.':
G .
--- Merging r35898 into '.':
U packages/fcl-passrc/tests/tcclasstype.pas
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r35898 into '.':
G .
--- Merging r35902 into '.':
U packages/fcl-passrc/tests/tctypeparser.pas
G packages/fcl-passrc/tests/tcresolver.pas
U packages/fcl-passrc/tests/tcuseanalyzer.pas
G packages/fcl-passrc/src/pparser.pp
G packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r35902 into '.':
G .
--- Merging r35903 into '.':
G packages/pastojs/tests/tcmodules.pas
U packages/pastojs/tests/tcconverter.pp
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r35903 into '.':
G .
--- Merging r35904 into '.':
G packages/fcl-passrc/tests/tcresolver.pas
G packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r35904 into '.':
G .
--- Merging r35905 into '.':
G packages/pastojs/tests/tcmodules.pas
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r35905 into '.':
G .
--- Merging r35908 into '.':
G packages/pastojs/src/fppas2js.pp
G packages/pastojs/tests/tcmodules.pas
--- Recording mergeinfo for merge of r35908 into '.':
G .
--- Merging r35909 into '.':
G packages/fcl-passrc/tests/tcuseanalyzer.pas
G packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r35909 into '.':
G .
--- Merging r35910 into '.':
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 r35910 into '.':
G .
--- Merging r35911 into '.':
G packages/pastojs/tests/tcmodules.pas
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r35911 into '.':
G .
--- Merging r35912 into '.':
U packages/fcl-passrc/src/pasuseanalyzer.pas
--- Recording mergeinfo for merge of r35912 into '.':
G .
--- Merging r35914 into '.':
G packages/fcl-passrc/src/pparser.pp
G packages/fcl-passrc/tests/tcstatements.pas
--- Recording mergeinfo for merge of r35914 into '.':
G .
--- Merging r35915 into '.':
G packages/fcl-passrc/tests/tcstatements.pas
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r35915 into '.':
G .
--- Merging r35916 into '.':
G packages/fcl-passrc/tests/tcclasstype.pas
U packages/fcl-passrc/src/pastree.pp
--- Recording mergeinfo for merge of r35916 into '.':
G .
--- Merging r35917 into '.':
G packages/pastojs/tests/tcmodules.pas
G packages/pastojs/src/fppas2js.pp
G packages/fcl-passrc/src/pasuseanalyzer.pas
--- Recording mergeinfo for merge of r35917 into '.':
G .
--- Merging r35919 into '.':
G packages/pastojs/tests/tcmodules.pas
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r35919 into '.':
G .
--- Merging r35920 into '.':
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r35920 into '.':
G .
--- Merging r35923 into '.':
G packages/fcl-passrc/src/pasresolver.pp
G packages/fcl-passrc/tests/tcresolver.pas
--- Recording mergeinfo for merge of r35923 into '.':
G .
--- Merging r35926 into '.':
G packages/fcl-passrc/src/pasresolver.pp
G packages/fcl-passrc/tests/tcresolver.pas
--- Recording mergeinfo for merge of r35926 into '.':
G .
--- Merging r35927 into '.':
G packages/pastojs/src/fppas2js.pp
G packages/pastojs/tests/tcmodules.pas
--- Recording mergeinfo for merge of r35927 into '.':
G .
--- Merging r35928 into '.':
G packages/fcl-passrc/tests/tcresolver.pas
G packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r35928 into '.':
G .
--- Merging r35931 into '.':
G packages/fcl-passrc/src/pasresolver.pp
G packages/fcl-passrc/tests/tcresolver.pas
--- Recording mergeinfo for merge of r35931 into '.':
G .
--- Merging r35932 into '.':
G packages/pastojs/tests/tcmodules.pas
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r35932 into '.':
G .
--- Merging r35933 into '.':
G packages/fcl-passrc/tests/tcstatements.pas
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r35933 into '.':
G .
--- Merging r35938 into '.':
U packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r35938 into '.':
G .
--- Merging r35939 into '.':
G packages/pastojs/tests/tcmodules.pas
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r35939 into '.':
G .
--- Merging r35940 into '.':
G packages/fcl-passrc/src/pasresolver.pp
G packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r35940 into '.':
G .
--- Merging r35947 into '.':
G packages/fcl-passrc/tests/tcclasstype.pas
G packages/fcl-passrc/tests/tcstatements.pas
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r35947 into '.':
G .
--- Merging r35948 into '.':
G packages/fcl-passrc/tests/tcclasstype.pas
--- Recording mergeinfo for merge of r35948 into '.':
G .
--- Merging r35949 into '.':
G packages/fcl-passrc/tests/tcclasstype.pas
--- Recording mergeinfo for merge of r35949 into '.':
G .
--- Merging r35950 into '.':
G packages/fcl-passrc/tests/tctypeparser.pas
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r35950 into '.':
G .
--- Merging r35951 into '.':
U packages/fcl-passrc/tests/tcscanner.pas
G packages/fcl-passrc/tests/tctypeparser.pas
G packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r35951 into '.':
G .
--- Merging r35960 into '.':
U packages/fcl-passrc/tests/tcexprparser.pas
G packages/fcl-passrc/src/pparser.pp
G packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r35960 into '.':
G .
--- Merging r35963 into '.':
G packages/fcl-passrc/src/pparser.pp
G packages/fcl-passrc/src/pastree.pp
--- Recording mergeinfo for merge of r35963 into '.':
G .
--- Merging r35964 into '.':
G packages/fcl-passrc/src/pastree.pp
U packages/fcl-passrc/src/passrcutil.pp
U packages/fcl-passrc/src/paswrite.pp
--- Recording mergeinfo for merge of r35964 into '.':
G .
--- Merging r35966 into '.':
G packages/fcl-passrc/src/pparser.pp
G packages/fcl-passrc/tests/tcexprparser.pas
--- Recording mergeinfo for merge of r35966 into '.':
G .
# revisions: 35883,35884,35887,35888,35889,35895,35896,35897,35898,35902,35903,35904,35905,35908,35909,35910,35911,35912,35914,35915,35916,35917,35919,35920,35923,35926,35927,35928,35931,35932,35933,35938,35939,35940,35947,35948,35949,35950,35951,35960,35963,35964,35966
git-svn-id: branches/fixes_3_0@35989 -
A packages/fcl-web/examples/simpleserver
A packages/fcl-web/examples/simpleserver/index.html
A packages/fcl-web/examples/simpleserver/README.txt
A packages/fcl-web/examples/simpleserver/index.css
A packages/fcl-web/examples/simpleserver/simpleserver.pas
A packages/fcl-web/examples/simpleserver/simpleserver.lpi
--- Recording mergeinfo for merge of r35822 into '.':
U .
--- Merging r35827 into '.':
U packages/fcl-passrc/tests/tcresolver.pas
U packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r35827 into '.':
G .
--- Merging r35828 into '.':
U packages/pastojs/tests/tcmodules.pas
U packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r35828 into '.':
G .
--- Merging r35829 into '.':
U packages/fcl-passrc/src/pparser.pp
U packages/fcl-passrc/src/pastree.pp
U packages/fcl-passrc/tests/tctypeparser.pas
--- Recording mergeinfo for merge of r35829 into '.':
G .
--- Merging r35839 into '.':
G packages/fcl-passrc/tests/tcresolver.pas
G packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r35839 into '.':
G .
--- Merging r35840 into '.':
G packages/pastojs/tests/tcmodules.pas
U packages/pastojs/tests/tcoptimizations.pas
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r35840 into '.':
G .
--- Merging r35842 into '.':
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r35842 into '.':
G .
--- Merging r35843 into '.':
G packages/pastojs/tests/tcmodules.pas
--- Recording mergeinfo for merge of r35843 into '.':
G .
--- Merging r35844 into '.':
G packages/fcl-passrc/tests/tcresolver.pas
G packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r35844 into '.':
G .
--- Merging r35845 into '.':
G packages/pastojs/tests/tcmodules.pas
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r35845 into '.':
G .
--- Merging r35846 into '.':
G packages/fcl-passrc/tests/tcresolver.pas
G packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r35846 into '.':
G .
--- Merging r35847 into '.':
G packages/pastojs/tests/tcmodules.pas
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r35847 into '.':
G .
--- Merging r35851 into '.':
G packages/fcl-passrc/src/pastree.pp
G packages/fcl-passrc/src/pasresolver.pp
G packages/fcl-passrc/tests/tcresolver.pas
U packages/fcl-passrc/tests/tcuseanalyzer.pas
--- Recording mergeinfo for merge of r35851 into '.':
G .
--- Merging r35852 into '.':
G packages/pastojs/tests/tcmodules.pas
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r35852 into '.':
G .
--- Merging r35853 into '.':
G packages/fcl-passrc/src/pasresolver.pp
U packages/fcl-passrc/src/pasuseanalyzer.pas
--- Recording mergeinfo for merge of r35853 into '.':
G .
--- Merging r35854 into '.':
G packages/pastojs/src/fppas2js.pp
G packages/pastojs/tests/tcmodules.pas
--- Recording mergeinfo for merge of r35854 into '.':
G .
--- Merging r35859 into '.':
G packages/fcl-passrc/tests/tcresolver.pas
G packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r35859 into '.':
G .
--- Merging r35860 into '.':
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r35860 into '.':
G .
--- Merging r35862 into '.':
G packages/pastojs/tests/tcmodules.pas
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r35862 into '.':
G .
--- Merging r35863 into '.':
G packages/fcl-passrc/src/pasresolver.pp
G packages/fcl-passrc/tests/tcresolver.pas
--- Recording mergeinfo for merge of r35863 into '.':
G .
--- Merging r35864 into '.':
G packages/pastojs/src/fppas2js.pp
G packages/pastojs/tests/tcmodules.pas
--- Recording mergeinfo for merge of r35864 into '.':
G .
--- Merging r35865 into '.':
G packages/fcl-passrc/tests/tcuseanalyzer.pas
G packages/fcl-passrc/src/pasuseanalyzer.pas
--- Recording mergeinfo for merge of r35865 into '.':
G .
--- Merging r35866 into '.':
G packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r35866 into '.':
G .
--- Merging r35867 into '.':
G packages/pastojs/src/fppas2js.pp
G packages/pastojs/tests/tcmodules.pas
--- Recording mergeinfo for merge of r35867 into '.':
G .
--- Merging r35868 into '.':
G packages/fcl-passrc/tests/tcresolver.pas
G packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r35868 into '.':
G .
--- Merging r35869 into '.':
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r35869 into '.':
G .
--- Merging r35870 into '.':
G packages/fcl-passrc/tests/tcresolver.pas
G packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r35870 into '.':
G .
--- Merging r35871 into '.':
G packages/pastojs/tests/tcmodules.pas
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r35871 into '.':
G .
--- Merging r35872 into '.':
G packages/fcl-passrc/src/pasresolver.pp
G packages/fcl-passrc/tests/tcresolver.pas
--- Recording mergeinfo for merge of r35872 into '.':
G .
--- Merging r35873 into '.':
G packages/pastojs/tests/tcmodules.pas
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r35873 into '.':
G .
--- Merging r35874 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 r35874 into '.':
G .
--- Merging r35875 into '.':
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r35875 into '.':
G .
--- Merging r35876 into '.':
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r35876 into '.':
G .
# revisions: 35822,35827,35828,35829,35839,35840,35842,35843,35844,35845,35846,35847,35851,35852,35853,35854,35859,35860,35862,35863,35864,35865,35866,35867,35868,35869,35870,35871,35872,35873,35874,35875,35876
git-svn-id: branches/fixes_3_0@35988 -
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 -
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 -
U packages/fcl-web/examples/echo/cgi/echo.lpi
U packages/fcl-web/examples/echo/cgi/echo.res
U packages/fcl-web/examples/httpclient/httpget.lpi
U packages/fcl-web/examples/httpapp/testhttp.pp
U packages/fcl-web/examples/httpapp/testhttp.lpi
U packages/fcl-web/examples/httpserver/simplehttpserver.lpi
A packages/fcl-web/examples/routing
A packages/fcl-web/examples/routing/demorouting.lpr
A packages/fcl-web/examples/routing/README
A packages/fcl-web/examples/routing/demorouting.lpi
A packages/fcl-web/examples/routing/routes.pp
A packages/fcl-web/examples/routing/sample.ini
U packages/fcl-web/fpmake.pp
A packages/fcl-web/tests/testfpweb.lpr
A packages/fcl-web/tests/tchttproute.pp
A packages/fcl-web/tests/testfpweb.lpi
U packages/fcl-web/src/base/fphttp.pp
A packages/fcl-web/src/base/tcwebmodule.pp
U packages/fcl-web/src/base/custweb.pp
U packages/fcl-web/src/base/httpdefs.pp
U packages/fcl-web/src/base/README.txt
A packages/fcl-web/src/base/httproute.pp
--- Recording mergeinfo for merge of r35292 into '.':
U .
--- Merging r35296 into '.':
U packages/fcl-json/fpmake.pp
A packages/fcl-json/tests/testjson2code.lpr
A packages/fcl-json/tests/testjson2code.lpi
A packages/fcl-json/tests/tcjsontocode.pp
A packages/fcl-json/src/fpjsontopas.pp
--- Recording mergeinfo for merge of r35296 into '.':
G .
--- Merging r35343 into '.':
U packages/fcl-json/tests/testjsondata.pp
U packages/fcl-json/src/fpjson.pp
--- Recording mergeinfo for merge of r35343 into '.':
G .
--- Merging r35384 into '.':
A utils/pas2js/dist
A utils/pas2js/dist/rtl.js
--- Recording mergeinfo for merge of r35384 into '.':
G .
--- Merging r35416 into '.':
U packages/fcl-js/src/jsbase.pp
U packages/fcl-js/src/jswriter.pp
--- Recording mergeinfo for merge of r35416 into '.':
G .
--- Merging r35417 into '.':
U packages/pastojs/src/fppas2js.pp
U packages/pastojs/tests/tcconverter.pp
U packages/pastojs/tests/tcmodules.pas
--- Recording mergeinfo for merge of r35417 into '.':
G .
--- Merging r35418 into '.':
U utils/pas2js/dist/rtl.js
--- Recording mergeinfo for merge of r35418 into '.':
G .
--- Merging r35429 into '.':
G utils/pas2js/dist/rtl.js
--- Recording mergeinfo for merge of r35429 into '.':
G .
--- Merging r35471 into '.':
G packages/fcl-js/src/jsbase.pp
G packages/fcl-js/src/jswriter.pp
--- Recording mergeinfo for merge of r35471 into '.':
G .
# revisions: 35292,35296,35343,35384,35416,35417,35418,35429,35471
git-svn-id: branches/fixes_3_0@35983 -
U packages/fcl-passrc/src/pparser.pp
U packages/fcl-passrc/src/pastree.pp
U packages/fcl-passrc/tests/tcclasstype.pas
--- Recording mergeinfo for merge of r34878 into '.':
U .
--- Merging r34879 into '.':
U packages/fcl-passrc/tests/tcscanner.pas
U packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r34879 into '.':
G .
--- Merging r34880 into '.':
U packages/fcl-passrc/tests/tctypeparser.pas
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r34880 into '.':
G .
--- Merging r34881 into '.':
G packages/fcl-passrc/src/pparser.pp
G packages/fcl-passrc/src/pastree.pp
G packages/fcl-passrc/tests/tcclasstype.pas
--- Recording mergeinfo for merge of r34881 into '.':
G .
--- Merging r34882 into '.':
U packages/fcl-passrc/tests/tcstatements.pas
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r34882 into '.':
G .
--- Merging r34883 into '.':
G packages/fcl-passrc/tests/tcscanner.pas
G packages/fcl-passrc/tests/tctypeparser.pas
U packages/fcl-passrc/tests/tcvarparser.pas
G packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r34883 into '.':
G .
--- Merging r35120 into '.':
U compiler/powerpc/cgcpu.pas
U compiler/powerpc/agppcmpw.pas
U compiler/assemble.pas
U compiler/script.pas
U compiler/powerpc64/cgcpu.pas
U utils/fpdoc/intl/dwriter.de.po
--- Recording mergeinfo for merge of r35120 into '.':
G .
--- Merging r35346 into '.':
U packages/fcl-passrc/tests/tcprocfunc.pas
G packages/fcl-passrc/src/pparser.pp
G packages/fcl-passrc/src/pastree.pp
--- Recording mergeinfo for merge of r35346 into '.':
G .
--- Merging r35353 into '.':
U packages/fcl-passrc/tests/tconstparser.pas
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r35353 into '.':
G .
--- Merging r35357 into '.':
G packages/fcl-passrc/src/pparser.pp
G packages/fcl-passrc/src/pscanner.pp
G packages/fcl-passrc/tests/tcscanner.pas
--- Recording mergeinfo for merge of r35357 into '.':
G .
--- Merging r35358 into '.':
A packages/fcl-passrc/examples/parsepp.pp
--- Recording mergeinfo for merge of r35358 into '.':
G .
--- Merging r35359 into '.':
U packages/fcl-passrc/examples/test_parser.pp
--- Recording mergeinfo for merge of r35359 into '.':
G .
--- Merging r35360 into '.':
G packages/fcl-passrc/src/pparser.pp
G packages/fcl-passrc/src/pastree.pp
G packages/fcl-passrc/tests/tctypeparser.pas
--- Recording mergeinfo for merge of r35360 into '.':
G .
--- Merging r35361 into '.':
G packages/fcl-passrc/tests/tcprocfunc.pas
G packages/fcl-passrc/src/pastree.pp
--- Recording mergeinfo for merge of r35361 into '.':
G .
--- Merging r35362 into '.':
G packages/fcl-passrc/src/pparser.pp
G packages/fcl-passrc/tests/tcstatements.pas
--- Recording mergeinfo for merge of r35362 into '.':
G .
--- Merging r35383 into '.':
U packages/fcl-js/src/jswriter.pp
U packages/pastojs/tests/tcconverter.pp
U packages/pastojs/tests/tcmodules.pas
U packages/pastojs/src/fppas2js.pp
U packages/fcl-passrc/tests/testpassrc.lpi
G packages/fcl-passrc/tests/tcclasstype.pas
G packages/fcl-passrc/tests/tcstatements.pas
U packages/fcl-passrc/tests/tcresolver.pas
G packages/fcl-passrc/src/pscanner.pp
G packages/fcl-passrc/src/pparser.pp
U packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r35383 into '.':
G .
--- Merging r35391 into '.':
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r35391 into '.':
G .
--- Merging r35402 into '.':
G packages/pastojs/src/fppas2js.pp
G packages/pastojs/tests/tcconverter.pp
G packages/pastojs/tests/tcmodules.pas
G packages/fcl-passrc/src/pasresolver.pp
G packages/fcl-passrc/src/pscanner.pp
G packages/fcl-passrc/src/pparser.pp
U packages/fcl-passrc/examples/parsepp.pp
G packages/fcl-passrc/tests/tcresolver.pas
G packages/fcl-js/src/jswriter.pp
--- Recording mergeinfo for merge of r35402 into '.':
G .
--- Merging r35415 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
G packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r35415 into '.':
G .
--- Merging r35420 into '.':
U utils/fpdoc/dw_man.pp
--- Recording mergeinfo for merge of r35420 into '.':
G .
# revisions: 34878,34879,34880,34881,34882,34883,35120,35346,35353,35357,35358,35359,35360,35361,35362,35383,35391,35402,35415,35420
git-svn-id: branches/fixes_3_0@35981 -
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 -
