U packages/chm/src/chmsitemap.pas
U packages/chm/src/chmwriter.pas
U packages/chm/src/chmfilewriter.pas
--- Recording mergeinfo for merge of r30987 into '.':
U .
# revisions: 30987
git-svn-id: branches/fixes_3_0@31083 -
U rtl/inc/fexpand.inc
--- Recording mergeinfo for merge of r30653 into '.':
U .
--- Merging r30654 into '.':
U tests/test/units/dos/tfexpand.pp
--- Recording mergeinfo for merge of r30654 into '.':
G .
--- Merging r30774 into '.':
G tests/test/units/dos/tfexpand.pp
--- Recording mergeinfo for merge of r30774 into '.':
G .
--- Merging r30788 into '.':
U rtl/amiga/system.pp
--- Recording mergeinfo for merge of r30788 into '.':
G .
--- Merging r30789 into '.':
U rtl/morphos/system.pp
--- Recording mergeinfo for merge of r30789 into '.':
G .
--- Merging r30790 into '.':
U packages/fcl-process/fpmake.pp
A packages/fcl-process/src/amicommon
A packages/fcl-process/src/amicommon/process.inc
A packages/fcl-process/src/amicommon/pipes.inc
A packages/fcl-process/src/amicommon/simpleipc.inc
--- Recording mergeinfo for merge of r30790 into '.':
G .
--- Merging r30803 into '.':
U packages/fcl-process/src/amicommon/simpleipc.inc
--- Recording mergeinfo for merge of r30803 into '.':
G .
--- Merging r30805 into '.':
U packages/fcl-process/src/amicommon/process.inc
U packages/fcl-process/src/amicommon/pipes.inc
--- Recording mergeinfo for merge of r30805 into '.':
G .
--- Merging r30806 into '.':
G packages/fcl-process/src/amicommon/process.inc
G packages/fcl-process/src/amicommon/pipes.inc
--- Recording mergeinfo for merge of r30806 into '.':
G .
--- Merging r30812 into '.':
U packages/morphunits/src/amigados.pas
U packages/amunits/src/coreunits/amigados.pas
G packages/fcl-process/src/amicommon/process.inc
G packages/fcl-process/src/amicommon/pipes.inc
U packages/arosunits/src/amigados.pas
--- Recording mergeinfo for merge of r30812 into '.':
G .
--- Merging r30813 into '.':
U rtl/aros/system.pp
--- Recording mergeinfo for merge of r30813 into '.':
G .
# revisions: 30653,30654,30774,30788,30789,30790,30803,30805,30806,30812,30813
git-svn-id: branches/fixes_3_0@31082 -
U rtl/amicommon/dos.pp
--- Recording mergeinfo for merge of r30364 into '.':
U .
--- Merging r30390 into '.':
G rtl/amicommon/dos.pp
--- Recording mergeinfo for merge of r30390 into '.':
G .
--- Merging r30391 into '.':
G rtl/amicommon/dos.pp
--- Recording mergeinfo for merge of r30391 into '.':
G .
--- Merging r30565 into '.':
U compiler/systems/i_amiga.pas
U compiler/systems/i_morph.pas
C rtl/amiga/Makefile
U rtl/amiga/Makefile.fpc
C rtl/morphos/Makefile
U rtl/morphos/Makefile.fpc
--- Recording mergeinfo for merge of r30565 into '.':
G .
Summary of conflicts:
Text conflicts: 2
# revisions: 30364,30390,30391,30565
git-svn-id: branches/fixes_3_0@31081 -
U packages/fcl-passrc/src/pparser.pp
U packages/fcl-passrc/tests/tctypeparser.pas
U packages/fcl-passrc/tests/testpassrc.lpi
--- Recording mergeinfo for merge of r29553 into '.':
U .
--- Merging r29555 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 r29555 into '.':
G .
--- Merging r29556 into '.':
U packages/fcl-passrc/tests/tcvarparser.pas
G packages/fcl-passrc/tests/tctypeparser.pas
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r29556 into '.':
G .
--- Merging r29615 into '.':
U packages/fcl-passrc/tests/tcprocfunc.pas
G packages/fcl-passrc/tests/testpassrc.lpi
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/tctypeparser.pas
U packages/fcl-passrc/src/pastree.pp
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r29615 into '.':
G .
--- Merging r30143 into '.':
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r30143 into '.':
G .
--- Merging r30326 into '.':
G packages/fcl-passrc/tests/tcclasstype.pas
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r30326 into '.':
G .
--- Merging r30625 into '.':
G packages/fcl-passrc/src/pastree.pp
G packages/fcl-passrc/src/pparser.pp
G packages/fcl-passrc/tests/tcstatements.pas
--- Recording mergeinfo for merge of r30625 into '.':
G .
# revisions: 29553,29555,29556,29615,30143,30326,30625
git-svn-id: branches/fixes_3_0@31080 -
U packages/fcl-web/src/base/custcgi.pp
U packages/fcl-web/src/base/custfcgi.pp
U packages/fcl-web/src/base/custweb.pp
--- Recording mergeinfo for merge of r29657 into '.':
U .
--- Merging r30123 into '.':
U packages/fcl-web/src/base/fphttpclient.pp
--- Recording mergeinfo for merge of r30123 into '.':
G .
--- Merging r30142 into '.':
G packages/fcl-web/src/base/custfcgi.pp
--- Recording mergeinfo for merge of r30142 into '.':
G .
--- Merging r30550 into '.':
U packages/fcl-web/fpmake.pp
A packages/fcl-web/src/base/httpprotocol.pp
G packages/fcl-web/src/base/custcgi.pp
U packages/fcl-web/src/base/fpapache.pp
G packages/fcl-web/src/base/custfcgi.pp
U packages/fcl-web/src/base/webutil.pp
G packages/fcl-web/src/base/custweb.pp
U packages/fcl-web/src/base/httpdefs.pp
A packages/fcl-web/src/base/cgiprotocol.pp
--- Recording mergeinfo for merge of r30550 into '.':
G .
--- Merging r30619 into '.':
G packages/fcl-web/src/base/fphttpclient.pp
--- Recording mergeinfo for merge of r30619 into '.':
G .
--- Merging r30639 into '.':
U packages/fcl-web/src/base/custhttpapp.pp
U packages/fcl-web/src/base/fphttpserver.pp
--- Recording mergeinfo for merge of r30639 into '.':
G .
--- Merging r30650 into '.':
G packages/fcl-web/src/base/fphttpserver.pp
--- Recording mergeinfo for merge of r30650 into '.':
G .
--- Merging r30688 into '.':
G packages/fcl-web/src/base/fphttpserver.pp
--- Recording mergeinfo for merge of r30688 into '.':
G .
--- Merging r30689 into '.':
G packages/fcl-web/src/base/fphttpserver.pp
--- Recording mergeinfo for merge of r30689 into '.':
G .
--- Merging r30693 into '.':
G packages/fcl-web/src/base/custfcgi.pp
--- Recording mergeinfo for merge of r30693 into '.':
G .
--- Merging r30694 into '.':
G packages/fcl-web/src/base/httpdefs.pp
--- Recording mergeinfo for merge of r30694 into '.':
G .
--- Merging r30743 into '.':
G packages/fcl-web/src/base/custfcgi.pp
--- Recording mergeinfo for merge of r30743 into '.':
G .
--- Merging r30744 into '.':
G packages/fcl-web/src/base/httpdefs.pp
--- Recording mergeinfo for merge of r30744 into '.':
G .
--- Merging r30745 into '.':
G packages/fcl-web/src/base/webutil.pp
--- Recording mergeinfo for merge of r30745 into '.':
G .
--- Merging r30760 into '.':
G packages/fcl-web/src/base/httpdefs.pp
--- Recording mergeinfo for merge of r30760 into '.':
G .
--- Merging r30791 into '.':
A packages/fcl-web/src/base/fpwebclient.pp
A packages/fcl-web/src/base/fphttpwebclient.pp
A packages/fcl-web/src/base/restbase.pp
A packages/fcl-web/src/base/fpoauth2.pp
A packages/fcl-web/src/base/fpoauth2ini.pp
A packages/fcl-web/src/base/fpjwt.pp
A packages/fcl-web/src/base/restcodegen.pp
G packages/fcl-web/fpmake.pp
--- Recording mergeinfo for merge of r30791 into '.':
G .
# revisions: 29657,30123,30142,30550,30619,30639,30650,30688,30689,30693,30694,30743,30744,30745,30760,30791
git-svn-id: branches/fixes_3_0@31079 -
U packages/fcl-db/src/base/fields.inc
U packages/fcl-db/src/base/db.pas
--- Recording mergeinfo for merge of r30610 into '.':
U .
--- Merging r30627 into '.':
U packages/fcl-db/src/sqldb/sqldb.pp
U packages/fcl-db/src/base/database.inc
--- Recording mergeinfo for merge of r30627 into '.':
G .
--- Merging r30640 into '.':
G packages/fcl-db/src/base/fields.inc
--- Recording mergeinfo for merge of r30640 into '.':
G .
--- Merging r30684 into '.':
G packages/fcl-db/src/base/fields.inc
--- Recording mergeinfo for merge of r30684 into '.':
G .
--- Merging r30691 into '.':
G packages/fcl-db/src/sqldb/sqldb.pp
--- Recording mergeinfo for merge of r30691 into '.':
G .
--- Merging r30702 into '.':
G packages/fcl-db/src/base/fields.inc
G packages/fcl-db/src/base/db.pas
--- Recording mergeinfo for merge of r30702 into '.':
G .
--- Merging r30703 into '.':
G packages/fcl-db/src/base/fields.inc
--- Recording mergeinfo for merge of r30703 into '.':
G .
--- Merging r30736 into '.':
U packages/fcl-db/src/sdf/sdfdata.pp
--- Recording mergeinfo for merge of r30736 into '.':
G .
--- Merging r30737 into '.':
U packages/fcl-db/src/memds/memds.pp
--- Recording mergeinfo for merge of r30737 into '.':
G .
--- Merging r30740 into '.':
U packages/fcl-db/src/sqlite/customsqliteds.pas
--- Recording mergeinfo for merge of r30740 into '.':
G .
--- Merging r30741 into '.':
U packages/fcl-db/src/sqlite/sqlite3ds.pas
--- Recording mergeinfo for merge of r30741 into '.':
G .
--- Merging r30771 into '.':
G packages/fcl-db/src/sqlite/customsqliteds.pas
--- Recording mergeinfo for merge of r30771 into '.':
G .
# revisions: 30610,30627,30640,30684,30691,30702,30703,30736,30737,30740,30741,30771
git-svn-id: branches/fixes_3_0@31078 -
U rtl/objpas/sysutils/datih.inc
U rtl/objpas/sysutils/dati.inc
--- Recording mergeinfo for merge of r30384 into '.':
U .
--- Merging r30557 into '.':
G rtl/objpas/sysutils/dati.inc
--- Recording mergeinfo for merge of r30557 into '.':
G .
--- Merging r30575 into '.':
U packages/fcl-db/src/base/fields.inc
U packages/fcl-db/src/base/db.pas
U packages/fcl-web/examples/echo/cgi/echo.lpi
U packages/fcl-web/examples/echo/webmodule/wmecho.pas
U packages/fcl-web/examples/echo/fcgi/echo.lpi
U packages/fcl-web/examples/httpserver/simplehttpserver.pas
U packages/fcl-web/examples/httpserver/simplehttpserver.lpi
U packages/fcl-web/tests/testcgiapp.lpi
U packages/fcl-web/tests/testcgiapp.pp
U packages/fcl-base/Makefile.fpc
U packages/fcl-base/src/fptimer.pp
U packages/rtl-extra/src/unix/clocale.pp
U packages/fcl-passrc/tests/testpassrc.lpi
U utils/fpdoc/dglobals.pp
U utils/fpdoc/testunit.pp
U utils/fpdoc/makeskel.pp
U utils/fpdoc/makeskel.lpi
G rtl/objpas/sysutils/dati.inc
G .
--- Recording mergeinfo for merge of r30575 into '.':
G .
--- Merging r30576 into '.':
G utils/fpdoc/dglobals.pp
G utils/fpdoc/makeskel.lpi
G utils/fpdoc/testunit.pp
G utils/fpdoc/makeskel.pp
G rtl/objpas/sysutils/dati.inc
G packages/fcl-web/examples/httpserver/simplehttpserver.lpi
G packages/fcl-web/examples/httpserver/simplehttpserver.pas
G packages/fcl-web/examples/echo/fcgi/echo.lpi
G packages/fcl-web/examples/echo/cgi/echo.lpi
G packages/fcl-web/examples/echo/webmodule/wmecho.pas
G packages/fcl-web/tests/testcgiapp.pp
G packages/fcl-web/tests/testcgiapp.lpi
G packages/rtl-extra/src/unix/clocale.pp
G packages/fcl-passrc/tests/testpassrc.lpi
G packages/fcl-base/Makefile.fpc
G packages/fcl-base/src/fptimer.pp
G packages/fcl-db/src/base/db.pas
G packages/fcl-db/src/base/fields.inc
--- Recording mergeinfo for merge of r30576 into '.':
G .
--- Merging r30577 into '.':
G rtl/objpas/sysutils/dati.inc
--- Recording mergeinfo for merge of r30577 into '.':
G .
--- Merging r30608 into '.':
U packages/rtl-objpas/src/inc/dateutil.inc
A tests/webtbs/tw27832.pp
--- Recording mergeinfo for merge of r30608 into '.':
G .
--- Merging r30620 into '.':
G rtl/objpas/sysutils/dati.inc
--- Recording mergeinfo for merge of r30620 into '.':
G .
# revisions: 30384,30557,30575,30576,30577,30608,30620
git-svn-id: branches/fixes_3_0@31077 -
U rtl/amiga/Makefile.fpc
U rtl/amiga/Makefile
--- Recording mergeinfo for merge of r29614 into '.':
U .
--- Merging r29643 into '.':
G rtl/amiga/Makefile
G rtl/amiga/Makefile.fpc
--- Recording mergeinfo for merge of r29643 into '.':
G .
--- Merging r29754 into '.':
U packages/arosunits/src/exec.pas
U packages/arosunits/src/amigados.pas
--- Recording mergeinfo for merge of r29754 into '.':
G .
--- Merging r30060 into '.':
U rtl/m68k/m68k.inc
--- Recording mergeinfo for merge of r30060 into '.':
G .
--- Merging r30092 into '.':
U packages/amunits/src/otherlibs/mui.pas
--- Recording mergeinfo for merge of r30092 into '.':
G .
--- Merging r30355 into '.':
U rtl/morphos/system.pp
--- Recording mergeinfo for merge of r30355 into '.':
G .
--- Merging r30356 into '.':
U rtl/amicommon/sysheap.inc
U rtl/amiga/system.pp
--- Recording mergeinfo for merge of r30356 into '.':
G .
--- Merging r30358 into '.':
U rtl/amicommon/dos.pp
U rtl/amicommon/sysutils.pp
--- Recording mergeinfo for merge of r30358 into '.':
G .
--- Merging r30536 into '.':
U packages/amunits/src/coreunits/agraphics.pas
U packages/morphunits/src/agraphics.pas
--- Recording mergeinfo for merge of r30536 into '.':
G .
--- Merging r30537 into '.':
G packages/morphunits/src/agraphics.pas
G packages/amunits/src/coreunits/agraphics.pas
U packages/amunits/src/otherlibs/render.pas
U packages/amunits/src/utilunits/doublebuffer.pas
--- Recording mergeinfo for merge of r30537 into '.':
G .
--- Merging r30538 into '.':
U packages/rtl-console/src/amicommon/video.pp
--- Recording mergeinfo for merge of r30538 into '.':
G .
--- Merging r30539 into '.':
G packages/rtl-console/src/amicommon/video.pp
--- Recording mergeinfo for merge of r30539 into '.':
G .
# revisions: 29614,29643,29754,30060,30092,30355,30356,30358,30536,30537,30538,30539
git-svn-id: branches/fixes_3_0@31075 -
U packages/fcl-base/src/fpexprpars.pp
--- Recording mergeinfo for merge of r30374 into '.':
U .
--- Merging r30375 into '.':
G packages/fcl-base/src/fpexprpars.pp
--- Recording mergeinfo for merge of r30375 into '.':
G .
# revisions: 30374,30375
git-svn-id: branches/fixes_3_0@31074 -
U packages/fcl-base/src/avl_tree.pp
--- Recording mergeinfo for merge of r30013 into '.':
U .
--- Merging r30075 into '.':
G packages/fcl-base/src/avl_tree.pp
--- Recording mergeinfo for merge of r30075 into '.':
G .
# revisions: 30013,30075
git-svn-id: branches/fixes_3_0@31073 -
U packages/fcl-db/src/sqldb/sqldb.pp
--- Recording mergeinfo for merge of r30462 into '.':
U .
--- Merging r30463 into '.':
U packages/fcl-db/tests/testsqldb.pas
U packages/fcl-db/src/sqldb/postgres/pqconnection.pp
U packages/fcl-db/src/sqldb/interbase/ibconnection.pp
G packages/fcl-db/src/sqldb/sqldb.pp
U packages/fcl-db/src/base/dbconst.pas
--- Recording mergeinfo for merge of r30463 into '.':
G .
--- Merging r30467 into '.':
U packages/fcl-db/src/sdf/sdfdata.pp
--- Recording mergeinfo for merge of r30467 into '.':
G .
--- Merging r30468 into '.':
U packages/fcl-db/src/base/db.pas
U packages/fcl-db/src/base/fields.inc
--- Recording mergeinfo for merge of r30468 into '.':
G .
--- Merging r30482 into '.':
G packages/fcl-db/src/base/db.pas
U packages/fcl-db/src/base/database.inc
--- Recording mergeinfo for merge of r30482 into '.':
G .
--- Merging r30483 into '.':
G packages/fcl-db/src/sqldb/sqldb.pp
--- Recording mergeinfo for merge of r30483 into '.':
G .
--- Merging r30493 into '.':
G packages/fcl-db/src/sqldb/sqldb.pp
--- Recording mergeinfo for merge of r30493 into '.':
G .
--- Merging r30494 into '.':
G packages/fcl-db/src/sqldb/sqldb.pp
--- Recording mergeinfo for merge of r30494 into '.':
G .
--- Merging r30503 into '.':
U packages/fcl-db/tests/testdbbasics.pas
G packages/fcl-db/src/sdf/sdfdata.pp
--- Recording mergeinfo for merge of r30503 into '.':
G .
--- Merging r30504 into '.':
G packages/fcl-db/src/sdf/sdfdata.pp
--- Recording mergeinfo for merge of r30504 into '.':
G .
--- Merging r30505 into '.':
G packages/fcl-db/src/sdf/sdfdata.pp
--- Recording mergeinfo for merge of r30505 into '.':
G .
--- Merging r30507 into '.':
G packages/fcl-db/tests/testdbbasics.pas
U packages/fcl-db/tests/sdfdstoolsunit.pas
G packages/fcl-db/src/sdf/sdfdata.pp
--- Recording mergeinfo for merge of r30507 into '.':
G .
--- Merging r30508 into '.':
G packages/fcl-db/src/sdf/sdfdata.pp
--- Recording mergeinfo for merge of r30508 into '.':
G .
--- Merging r30509 into '.':
G packages/fcl-db/src/sdf/sdfdata.pp
--- Recording mergeinfo for merge of r30509 into '.':
G .
--- Merging r30513 into '.':
U packages/fcl-db/tests/tcsdfdata.pp
G packages/fcl-db/src/sdf/sdfdata.pp
--- Recording mergeinfo for merge of r30513 into '.':
G .
--- Merging r30529 into '.':
G packages/fcl-db/src/sdf/sdfdata.pp
G packages/fcl-db/tests/tcsdfdata.pp
--- Recording mergeinfo for merge of r30529 into '.':
G .
--- Merging r30530 into '.':
G packages/fcl-db/tests/tcsdfdata.pp
G packages/fcl-db/src/sdf/sdfdata.pp
--- Recording mergeinfo for merge of r30530 into '.':
G .
--- Merging r30531 into '.':
G packages/fcl-db/tests/testdbbasics.pas
G packages/fcl-db/src/sdf/sdfdata.pp
--- Recording mergeinfo for merge of r30531 into '.':
G .
--- Merging r30532 into '.':
G packages/fcl-db/src/sdf/sdfdata.pp
--- Recording mergeinfo for merge of r30532 into '.':
G .
--- Merging r30567 into '.':
G packages/fcl-db/tests/tcsdfdata.pp
G packages/fcl-db/src/sdf/sdfdata.pp
--- Recording mergeinfo for merge of r30567 into '.':
G .
--- Merging r30568 into '.':
G packages/fcl-db/tests/tcsdfdata.pp
--- Recording mergeinfo for merge of r30568 into '.':
G .
--- Merging r30569 into '.':
G packages/fcl-db/src/sdf/sdfdata.pp
--- Recording mergeinfo for merge of r30569 into '.':
G .
--- Merging r30570 into '.':
G packages/fcl-db/tests/testdbbasics.pas
--- Recording mergeinfo for merge of r30570 into '.':
G .
--- Merging r30571 into '.':
U packages/fcl-db/src/datadict/fpdatadict.pp
--- Recording mergeinfo for merge of r30571 into '.':
G .
# revisions: 30462,30463,30467,30468,30482,30483,30493,30494,30503,30504,30505,30507,30508,30509,30513,30529,30530,30531,30532,30567,30568,30569,30570,30571
git-svn-id: branches/fixes_3_0@31072 -
U packages/fcl-xml/src/dom.pp
U packages/fcl-xml/src/xmlread.pp
--- Recording mergeinfo for merge of r29761 into '.':
U .
--- Merging r30323 into '.':
U packages/fcl-xml/src/xmlconf.pp
--- Recording mergeinfo for merge of r30323 into '.':
G .
--- Merging r30324 into '.':
A packages/fcl-xml/tests/testxmlconf.lpr
A packages/fcl-xml/tests/testxmlconf.lpi
--- Recording mergeinfo for merge of r30324 into '.':
G .
# revisions: 29761,30323,30324
git-svn-id: branches/fixes_3_0@31070 -
U packages/sqlite/src/sqlite3.inc
--- Recording mergeinfo for merge of r30137 into '.':
U .
--- Merging r30138 into '.':
U packages/sqlite/tests/test.pas
U packages/sqlite/src/sqlite3db.pas
--- Recording mergeinfo for merge of r30138 into '.':
G .
--- Merging r30139 into '.':
G packages/sqlite/src/sqlite3.inc
--- Recording mergeinfo for merge of r30139 into '.':
G .
--- Merging r30149 into '.':
G packages/sqlite/src/sqlite3.inc
--- Recording mergeinfo for merge of r30149 into '.':
G .
--- Merging r30154 into '.':
U packages/fcl-db/src/sqldb/mysql/mysqlconn.inc
--- Recording mergeinfo for merge of r30154 into '.':
G .
--- Merging r30155 into '.':
G packages/fcl-db/src/sqldb/mysql/mysqlconn.inc
--- Recording mergeinfo for merge of r30155 into '.':
G .
--- Merging r30291 into '.':
U packages/fcl-db/tests/testsqldb.pas
U packages/fcl-db/src/sqldb/postgres/pqconnection.pp
U packages/fcl-db/src/sqldb/interbase/ibconnection.pp
U packages/fcl-db/src/sqldb/sqldb.pp
--- Recording mergeinfo for merge of r30291 into '.':
G .
--- Merging r30295 into '.':
U packages/fcl-db/tests/testspecifictbufdataset.pas
U packages/fcl-db/src/base/bufdataset.pas
--- Recording mergeinfo for merge of r30295 into '.':
G .
--- Merging r30305 into '.':
G packages/fcl-db/src/sqldb/sqldb.pp
G packages/fcl-db/src/sqldb/postgres/pqconnection.pp
G packages/fcl-db/src/sqldb/interbase/ibconnection.pp
--- Recording mergeinfo for merge of r30305 into '.':
G .
--- Merging r30306 into '.':
U packages/fcl-db/src/base/sqlscript.pp
--- Recording mergeinfo for merge of r30306 into '.':
G .
--- Merging r30325 into '.':
U packages/fcl-db/tests/testdbbasics.pas
G packages/fcl-db/src/base/bufdataset.pas
--- Recording mergeinfo for merge of r30325 into '.':
G .
--- Merging r30366 into '.':
U packages/fcl-db/src/base/dataset.inc
U packages/fcl-db/src/base/db.pas
--- Recording mergeinfo for merge of r30366 into '.':
G .
--- Merging r30383 into '.':
G packages/fcl-db/src/base/bufdataset.pas
--- Recording mergeinfo for merge of r30383 into '.':
G .
--- Merging r30397 into '.':
G packages/fcl-db/src/base/bufdataset.pas
--- Recording mergeinfo for merge of r30397 into '.':
G .
--- Merging r30399 into '.':
U packages/fcl-db/tests/testfieldtypes.pas
U packages/fcl-db/src/sqldb/mssql/mssqlconn.pp
--- Recording mergeinfo for merge of r30399 into '.':
G .
--- Merging r30400 into '.':
G packages/fcl-db/src/base/db.pas
--- Recording mergeinfo for merge of r30400 into '.':
G .
--- Merging r30417 into '.':
U packages/fcl-db/fpmake.pp
A packages/fcl-db/tests/tccsvdataset.pp
U packages/fcl-db/tests/dbtestframework.pas
U packages/fcl-db/tests/dbtestframework_gui.lpi
U packages/fcl-db/tests/dbtestframework_gui.lpr
A packages/fcl-db/src/base/csvdataset.pp
--- Recording mergeinfo for merge of r30417 into '.':
G .
--- Merging r30416 into '.':
U packages/fcl-base/fpmake.pp
A packages/fcl-base/src/csvdocument.pp
A packages/fcl-base/src/csvreadwrite.pp
--- Recording mergeinfo for merge of r30416 into '.':
G .
--- Merging r30418 into '.':
U packages/fcl-db/src/export/fpcsvexport.pp
U packages/fcl-db/tests/testdbexport.pas
--- Recording mergeinfo for merge of r30418 into '.':
G .
--- Merging r30421 into '.':
U packages/fcl-db/tests/tcsdfdata.pp
U packages/fcl-db/src/sdf/sdfdata.pp
--- Recording mergeinfo for merge of r30421 into '.':
G .
--- Merging r30431 into '.':
G packages/fcl-db/src/base/db.pas
U packages/fcl-db/src/base/database.inc
--- Recording mergeinfo for merge of r30431 into '.':
G .
--- Merging r30433 into '.':
G packages/fcl-db/src/base/bufdataset.pas
U packages/fcl-db/src/base/csvdataset.pp
--- Recording mergeinfo for merge of r30433 into '.':
G .
--- Merging r30434 into '.':
U packages/fcl-db/src/base/dbconst.pas
G packages/fcl-db/src/base/bufdataset.pas
--- Recording mergeinfo for merge of r30434 into '.':
G .
--- Merging r30435 into '.':
G packages/fcl-db/src/base/db.pas
U packages/fcl-db/src/base/fields.inc
G packages/fcl-db/src/base/dataset.inc
--- Recording mergeinfo for merge of r30435 into '.':
G .
--- Merging r30437 into '.':
G packages/fcl-db/src/sqldb/sqldb.pp
--- Recording mergeinfo for merge of r30437 into '.':
G .
# revisions: 30137,30138,30139,30149,30154,30155,30291,30295,30305,30306,30325,30366,30383,30397,30399,30400,30417,30416,30418,30421,30431,30433,30434,30435,30437
git-svn-id: branches/fixes_3_0@31068 -
U packages/mysql/src/mysql.inc
--- Recording mergeinfo for merge of r29680 into '.':
U .
--- Merging r29681 into '.':
U packages/dblib/src/dblib.pp
--- Recording mergeinfo for merge of r29681 into '.':
G .
--- Merging r29719 into '.':
U packages/fcl-db/src/sqldb/odbc/odbcconn.pas
--- Recording mergeinfo for merge of r29719 into '.':
G .
--- Merging r29751 into '.':
G packages/fcl-db/src/sqldb/odbc/odbcconn.pas
U packages/fcl-db/tests/testsqldb.pas
--- Recording mergeinfo for merge of r29751 into '.':
G .
--- Merging r29758 into '.':
U packages/fcl-db/src/base/db.pas
U packages/fcl-db/src/base/fields.inc
--- Recording mergeinfo for merge of r29758 into '.':
G .
--- Merging r29759 into '.':
U packages/fcl-db/src/sqldb/oracle/oracleconnection.pp
--- Recording mergeinfo for merge of r29759 into '.':
G .
--- Merging r29764 into '.':
G packages/fcl-db/src/sqldb/odbc/odbcconn.pas
--- Recording mergeinfo for merge of r29764 into '.':
G .
--- Merging r29765 into '.':
U packages/fcl-db/src/sqldb/sqlite/sqlite3conn.pp
--- Recording mergeinfo for merge of r29765 into '.':
G .
--- Merging r29766 into '.':
U packages/sqlite/src/sqlite3.inc
--- Recording mergeinfo for merge of r29766 into '.':
G .
--- Merging r30005 into '.':
U packages/fcl-db/src/dbase/dbf_str_pl.pas
--- Recording mergeinfo for merge of r30005 into '.':
G .
--- Merging r30012 into '.':
U packages/fcl-db/src/dbase/dbf_str_fr.pas
U packages/fcl-db/src/dbase/dbf_str_nl.pas
U packages/fcl-db/src/dbase/dbf_str_ita.pas
U packages/fcl-db/src/dbase/dbf_str.pas
U packages/fcl-db/src/dbase/dbf_str_pt.pas
U packages/fcl-db/src/dbase/dbf_str_ru.pas
U packages/fcl-db/src/dbase/dbf_str_es.pas
--- Recording mergeinfo for merge of r30012 into '.':
G .
--- Merging r30082 into '.':
U packages/fcl-db/src/sqldb/mssql/mssqlconn.pp
--- Recording mergeinfo for merge of r30082 into '.':
G .
--- Merging r30120 into '.':
U packages/fcl-db/src/sqldb/mysql/mysqlconn.inc
--- Recording mergeinfo for merge of r30120 into '.':
G .
--- Merging r30121 into '.':
U packages/fcl-db/src/sqldb/postgres/pqconnection.pp
--- Recording mergeinfo for merge of r30121 into '.':
G .
# revisions: 29680,29681,29719,29751,29758,29759,29764,29765,29766,30005,30012,30082,30120,30121
git-svn-id: branches/fixes_3_0@31067 -
U utils/h2pas/h2plexlib.pas
--- Recording mergeinfo for merge of r29426 into '.':
U .
--- Merging r30553 into '.':
U utils/h2pas/yylex.cod
U utils/h2pas/yyparse.cod
--- Recording mergeinfo for merge of r30553 into '.':
G .
# revisions: 29426,30553
git-svn-id: branches/fixes_3_0@31066 -
U compiler/symdef.pas
A tests/webtbs/tw27320.pp
A tests/webtbs/uw27320.defaults.pp
--- Recording mergeinfo for merge of r29537 into '.':
U .
--- Merging r29579 into '.':
A tests/webtbs/tw27348.pp
G compiler/symdef.pas
--- Recording mergeinfo for merge of r29579 into '.':
G .
--- Merging r29743 into '.':
U compiler/rautils.pas
G compiler/symdef.pas
--- Recording mergeinfo for merge of r29743 into '.':
G .
--- Merging r29685 into '.':
A tests/webtbs/tw27424.pp
U compiler/pgenutil.pas
--- Recording mergeinfo for merge of r29685 into '.':
G .
--- Merging r30160 into '.':
U rtl/inc/cgeneric.inc
--- Recording mergeinfo for merge of r30160 into '.':
G .
--- Merging r31028 into '.':
U rtl/objpas/classes/classes.inc
A tests/webtbs/tw28271.pp
--- Recording mergeinfo for merge of r31028 into '.':
G .
# revisions: 29537,29579,29743,29685,30160,31028
git-svn-id: branches/fixes_3_0@31065 -
U rtl/win/wininc/defines.inc
--- Recording mergeinfo for merge of r30918 into '.':
U .
--- Merging r30919 into '.':
A packages/winunits-base/src/shlwapi.pp
U packages/winunits-base/src/buildwinutilsbase.pp
U packages/winunits-base/fpmake.pp
--- Recording mergeinfo for merge of r30919 into '.':
G .
# revisions: 30918,30919
git-svn-id: branches/fixes_3_0@30982 -
U packages/fcl-image/src/freetype.pp
--- Merging r29723 into '.':
U packages/libc/src/typesh.inc
--- Merging r29760 into '.':
U packages/winunits-base/src/eventsink.pp
--- Merging r30184 into '.':
U packages/winunits-jedi/src/jwawinnt.pas
# revisions: 29683,29723,29760,30184
git-svn-id: branches/fixes_3_0@30840 -
U utils/fpdoc/fpdoc.pp
--- Merging r30624 into '.':
U utils/fpdoc/dglobals.pp
--- Merging r30742 into '.':
U utils/fpdoc/unitdiff.pp
# revisions: 30609,30624,30742
git-svn-id: branches/fixes_3_0@30826 -
U utils/tply/pyacc.y
--- Merging r29503 into '.':
U utils/tply/lexbase.pas
G utils/tply/pyacc.y
U utils/tply/pyacc.pas
U utils/tply/plex.pas
U utils/tply/yaccbase.pas
--- Merging r30289 into '.':
U utils/tply/README.txt
# revisions: 29502,29503,30289
git-svn-id: branches/fixes_3_0@30825 -
U utils/fppkg/lnet/ltelnet.pp
U utils/fppkg/lnet/lcontrolstack.pp
--- Merging r29467 into '.':
U packages/paszlib/src/zipper.pp
--- Merging r29468 into '.':
U utils/fppkg/lnet/lftp.pp
# revisions: 29465,29466,29467,29468
git-svn-id: branches/fixes_3_0@30824 -
U utils/h2pas/h2plexlib.pas
U utils/h2pas/scan.l
U utils/h2pas/h2pas.y
U utils/h2pas/h2poptions.pas
U utils/h2pas/h2pas.pas
U utils/h2pas/h2pyacclib.pas
U utils/h2pas/scan.pas
# revisions: 29425
git-svn-id: branches/fixes_3_0@30822 -
U rtl/win/wininc/base.inc
U rtl/win/wininc/func.inc
U rtl/win/wininc/defines.inc
U rtl/win/wininc/struct.inc
--- Merging r30185 into '.':
G rtl/win/wininc/func.inc
--- Merging r30256 into '.':
G rtl/win/wininc/base.inc
--- Merging r30264 into '.':
G rtl/win/wininc/struct.inc
--- Merging r30279 into '.':
G rtl/win/wininc/struct.inc
# revisions: 30182,30185,30256,30264,30279
git-svn-id: branches/fixes_3_0@30328 -
U compiler/powerpc/cgcpu.pas
U compiler/powerpc/cpubase.pas
U compiler/powerpc64/cgcpu.pas
U compiler/ncgutil.pas
U compiler/ppcgen/hlcgppc.pas
A tests/webtbs/tw27634.pp
--- Merging r30169 into '.':
U compiler/pdecobj.pas
A tests/test/tobjc43.pp
--- Merging r30177 into '.':
U compiler/pexpr.pas
A tests/test/tmacfunret2.pp
--- Merging r30178 into '.':
U compiler/options.pas
--- Merging r30204 into '.':
U compiler/i8086/cpupara.pas
--- Merging r30208 into '.':
U compiler/powerpc64/cpubase.pas
U compiler/powerpc64/itcpugas.pas
--- Merging r30209 into '.':
U rtl/linux/si_intf.inc
--- Merging r30219 into '.':
U compiler/powerpc64/cpupara.pas
# revisions: 30164,30169,30177,30178,30204,30208,30209,30219
git-svn-id: branches/fixes_3_0@30252 -
U packages/libogcfpc/fpmake.pp
U packages/libogcfpc/src/ogc/gx.inc
A packages/libogcfpc/src/ogc/libversion.inc
U packages/libogcfpc/src/wiikeyboard/wsksymdef.inc
U packages/libogcfpc/src/bte/bte.inc
U packages/libogcfpc/src/gccore.inc
U packages/libogcfpc/Makefile.fpc.fpcmake
U packages/libogcfpc/examples/audio/mp3player/Makefile.fpc
U packages/mad/fpmake.pp
A rtl/wii/rtl.cfg
U rtl/wii/system.pp
U rtl/wii/sysutils.pp
U rtl/wii/Makefile.fpc
U rtl/wii/sysdir.inc
U compiler/systems/t_wii.pas
--- Merging r30161 into '.':
G rtl/wii/sysdir.inc
# revisions: 30125,30161
git-svn-id: branches/fixes_3_0@30171 -
U rtl/gba/Makefile
U rtl/gba/Makefile.fpc
--- Merging r30008 into '.':
U packages/libndsfpc/fpmake.pp
U packages/libndsfpc/src/nds/libversion.inc
U packages/libndsfpc/src/nds/system.inc
U packages/libndsfpc/src/nds/fifocommon.inc
U packages/libndsfpc/src/nds/fifomessages.inc
U packages/libndsfpc/examples/debugging/exceptionTest/Makefile.fpc
U packages/libndsfpc/examples/ds_motion/Makefile.fpc
U packages/libndsfpc/examples/time/stopwatch/Makefile.fpc
U packages/libndsfpc/examples/time/timercallback/Makefile.fpc
U packages/libndsfpc/examples/time/RealTimeClock/Makefile.fpc
U packages/libndsfpc/examples/input/keyboard/keyboard_stdin/Makefile.fpc
U packages/libndsfpc/examples/input/keyboard/keyboard_async/Makefile.fpc
U packages/libndsfpc/examples/input/Touch_Pad/touch_test/Makefile.fpc
U packages/libndsfpc/examples/input/Touch_Pad/touch_look/Makefile.fpc
U packages/libndsfpc/examples/input/Touch_Pad/touch_area/Makefile.fpc
U packages/libndsfpc/examples/graphics/Effects/windows/Makefile.fpc
U packages/libndsfpc/examples/graphics/Ext_Palettes/backgrounds/Makefile.fpc
D packages/libndsfpc/examples/graphics/Ext_Palettes/backgrounds/inc
U packages/libndsfpc/examples/graphics/Backgrounds/256_color_bmp/Makefile.fpc
U packages/libndsfpc/examples/graphics/Backgrounds/all_in_one/Makefile.fpc
U packages/libndsfpc/examples/graphics/Backgrounds/rotation/Makefile.fpc
U packages/libndsfpc/examples/graphics/Backgrounds/16bit_color_bmp/Makefile.fpc
U packages/libndsfpc/examples/graphics/Backgrounds/Double_Buffer/Makefile.fpc
U packages/libndsfpc/examples/graphics/3D/Display_List/Makefile.fpc
U packages/libndsfpc/examples/graphics/3D/Mixed_Text_3D/Makefile.fpc
U packages/libndsfpc/examples/graphics/3D/Paletted_Cube/Makefile.fpc
U packages/libndsfpc/examples/graphics/3D/Textured_Cube/Makefile.fpc
U packages/libndsfpc/examples/graphics/3D/Env_Mapping/Makefile.fpc
U packages/libndsfpc/examples/graphics/3D/Simple_Quad/Makefile.fpc
U packages/libndsfpc/examples/graphics/3D/3D_Both_Screens/Makefile.fpc
U packages/libndsfpc/examples/graphics/3D/Simple_Tri/Makefile.fpc
U packages/libndsfpc/examples/graphics/3D/Toon_Shading/Makefile.fpc
U packages/libndsfpc/examples/graphics/3D/Textured_Quad/Makefile.fpc
U packages/libndsfpc/examples/graphics/3D/nehe/lesson07/Makefile.fpc
U packages/libndsfpc/examples/graphics/3D/nehe/lesson08/Makefile.fpc
U packages/libndsfpc/examples/graphics/3D/nehe/lesson09/Makefile.fpc
U packages/libndsfpc/examples/graphics/3D/nehe/lesson01/Makefile.fpc
U packages/libndsfpc/examples/graphics/3D/nehe/lesson10/Makefile.fpc
U packages/libndsfpc/examples/graphics/3D/nehe/lesson02/Makefile.fpc
U packages/libndsfpc/examples/graphics/3D/nehe/lesson11/Makefile.fpc
U packages/libndsfpc/examples/graphics/3D/nehe/lesson03/Makefile.fpc
U packages/libndsfpc/examples/graphics/3D/nehe/lesson10b/Makefile.fpc
U packages/libndsfpc/examples/graphics/3D/nehe/lesson04/Makefile.fpc
U packages/libndsfpc/examples/graphics/3D/nehe/lesson05/Makefile.fpc
U packages/libndsfpc/examples/graphics/3D/nehe/lesson06/Makefile.fpc
U packages/libndsfpc/examples/graphics/3D/Display_List_2/Makefile.fpc
U packages/libndsfpc/examples/graphics/3D/Picking/Makefile.fpc
U packages/libndsfpc/examples/graphics/3D/BoxTest/Makefile.fpc
U packages/libndsfpc/examples/graphics/3D/Ortho/Makefile.fpc
U packages/libndsfpc/examples/graphics/Sprites/animate_simple/Makefile.fpc
U packages/libndsfpc/examples/graphics/Sprites/sprite_extended_palettes/Makefile.fpc
U packages/libndsfpc/examples/graphics/Sprites/simple/Makefile.fpc
U packages/libndsfpc/examples/graphics/Sprites/fire_and_sprites/Makefile.fpc
U packages/libndsfpc/examples/graphics/Sprites/allocation_test/Makefile.fpc
U packages/libndsfpc/examples/graphics/Sprites/sprite_rotate/Makefile.fpc
U packages/libndsfpc/examples/graphics/Sprites/bitmap_sprites/Makefile.fpc
U packages/libndsfpc/examples/graphics/Printing/ansi_console/Makefile.fpc
U packages/libndsfpc/examples/graphics/Printing/console_windows/Makefile.fpc
U packages/libndsfpc/examples/graphics/Printing/custom_font/Makefile.fpc
U packages/libndsfpc/examples/graphics/Printing/rotscale_text/Makefile.fpc
U packages/libndsfpc/examples/graphics/Printing/print_both_screens/Makefile.fpc
U packages/libndsfpc/examples/audio/maxmod/reverb/Makefile.fpc
U packages/libndsfpc/examples/audio/maxmod/song_events_example/Makefile.fpc
U packages/libndsfpc/examples/audio/maxmod/song_events_example2/Makefile.fpc
U packages/libndsfpc/examples/audio/maxmod/audio_modes/Makefile.fpc
U packages/libndsfpc/examples/audio/maxmod/basic_sound/Makefile.fpc
A packages/libndsfpc/examples/audio/maxmod/streaming
A packages/libndsfpc/examples/audio/maxmod/streaming/Makefile
A packages/libndsfpc/examples/audio/maxmod/streaming/Makefile.fpc
A packages/libndsfpc/examples/audio/maxmod/streaming/streaming.pp
U packages/libndsfpc/examples/audio/micrecord/Makefile.fpc
U packages/libndsfpc/examples/filesystem/libfat/access_dir/Makefile.fpc
U packages/libndsfpc/examples/filesystem/libfat/access_file/Makefile.fpc
U packages/libndsfpc/examples/filesystem/libfat/libfatdir/Makefile.fpc
U packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/Makefile.fpc
U packages/libndsfpc/examples/filesystem/embedded_gbfs/Makefile.fpc
U packages/libndsfpc/examples/dswifi/ap_search/Makefile.fpc
U packages/libndsfpc/examples/dswifi/httpget/Makefile.fpc
U packages/libndsfpc/examples/dswifi/autoconnect/Makefile.fpc
U packages/libndsfpc/examples/gl2d/dual_screen/Makefile.fpc
U packages/libndsfpc/examples/gl2d/fonts/Makefile.fpc
U packages/libndsfpc/examples/gl2d/sprites/Makefile.fpc
U packages/libndsfpc/examples/gl2d/primitives/Makefile.fpc
U packages/libndsfpc/examples/gl2d/scrolling/Makefile.fpc
U packages/libndsfpc/examples/gl2d/2Dplus3D/Makefile.fpc
U packages/libndsfpc/examples/card/eeprom/Makefile.fpc
U packages/libndsfpc/examples/hello_world/Makefile.fpc
U rtl/nds/sysutils.pp
U rtl/nds/Makefile.fpc
A rtl/nds/rtl.cfg
U rtl/nds/system.pp
Skipped 'rtl/gba/rtl.cfg'
--- Merging r30074 into '.':
C rtl/gba/Makefile
G rtl/gba/Makefile.fpc
U packages/libgbafpc/Makefile.fpc.fpcmake
G packages/libndsfpc/examples/hello_world/Makefile.fpc
G packages/libndsfpc/examples/debugging/exceptionTest/Makefile.fpc
G packages/libndsfpc/examples/ds_motion/Makefile.fpc
G packages/libndsfpc/examples/time/stopwatch/Makefile.fpc
G packages/libndsfpc/examples/time/timercallback/Makefile.fpc
G packages/libndsfpc/examples/time/RealTimeClock/Makefile.fpc
G packages/libndsfpc/examples/input/keyboard/keyboard_stdin/Makefile.fpc
G packages/libndsfpc/examples/input/keyboard/keyboard_async/Makefile.fpc
G packages/libndsfpc/examples/input/Touch_Pad/touch_look/Makefile.fpc
G packages/libndsfpc/examples/input/Touch_Pad/touch_area/Makefile.fpc
G packages/libndsfpc/examples/input/Touch_Pad/touch_test/Makefile.fpc
G packages/libndsfpc/examples/graphics/Effects/windows/Makefile.fpc
G packages/libndsfpc/examples/graphics/Ext_Palettes/backgrounds/Makefile.fpc
G packages/libndsfpc/examples/graphics/Backgrounds/all_in_one/Makefile.fpc
G packages/libndsfpc/examples/graphics/Backgrounds/rotation/Makefile.fpc
G packages/libndsfpc/examples/graphics/Backgrounds/16bit_color_bmp/Makefile.fpc
G packages/libndsfpc/examples/graphics/Backgrounds/Double_Buffer/Makefile.fpc
G packages/libndsfpc/examples/graphics/Backgrounds/256_color_bmp/Makefile.fpc
G packages/libndsfpc/examples/graphics/3D/Picking/Makefile.fpc
G packages/libndsfpc/examples/graphics/3D/BoxTest/Makefile.fpc
G packages/libndsfpc/examples/graphics/3D/Ortho/Makefile.fpc
G packages/libndsfpc/examples/graphics/3D/Display_List/Makefile.fpc
G packages/libndsfpc/examples/graphics/3D/Mixed_Text_3D/Makefile.fpc
G packages/libndsfpc/examples/graphics/3D/Paletted_Cube/Makefile.fpc
G packages/libndsfpc/examples/graphics/3D/Textured_Cube/Makefile.fpc
G packages/libndsfpc/examples/graphics/3D/Env_Mapping/Makefile.fpc
G packages/libndsfpc/examples/graphics/3D/Simple_Quad/Makefile.fpc
G packages/libndsfpc/examples/graphics/3D/3D_Both_Screens/Makefile.fpc
G packages/libndsfpc/examples/graphics/3D/Simple_Tri/Makefile.fpc
G packages/libndsfpc/examples/graphics/3D/Toon_Shading/Makefile.fpc
G packages/libndsfpc/examples/graphics/3D/Textured_Quad/Makefile.fpc
G packages/libndsfpc/examples/graphics/3D/nehe/lesson01/Makefile.fpc
G packages/libndsfpc/examples/graphics/3D/nehe/lesson10/Makefile.fpc
G packages/libndsfpc/examples/graphics/3D/nehe/lesson02/Makefile.fpc
G packages/libndsfpc/examples/graphics/3D/nehe/lesson11/Makefile.fpc
G packages/libndsfpc/examples/graphics/3D/nehe/lesson03/Makefile.fpc
G packages/libndsfpc/examples/graphics/3D/nehe/lesson10b/Makefile.fpc
G packages/libndsfpc/examples/graphics/3D/nehe/lesson04/Makefile.fpc
G packages/libndsfpc/examples/graphics/3D/nehe/lesson05/Makefile.fpc
G packages/libndsfpc/examples/graphics/3D/nehe/lesson06/Makefile.fpc
G packages/libndsfpc/examples/graphics/3D/nehe/lesson07/Makefile.fpc
G packages/libndsfpc/examples/graphics/3D/nehe/lesson08/Makefile.fpc
G packages/libndsfpc/examples/graphics/3D/nehe/lesson09/Makefile.fpc
G packages/libndsfpc/examples/graphics/3D/Display_List_2/Makefile.fpc
G packages/libndsfpc/examples/graphics/Sprites/simple/Makefile.fpc
G packages/libndsfpc/examples/graphics/Sprites/fire_and_sprites/Makefile.fpc
G packages/libndsfpc/examples/graphics/Sprites/allocation_test/Makefile.fpc
G packages/libndsfpc/examples/graphics/Sprites/sprite_rotate/Makefile.fpc
G packages/libndsfpc/examples/graphics/Sprites/bitmap_sprites/Makefile.fpc
G packages/libndsfpc/examples/graphics/Sprites/animate_simple/Makefile.fpc
G packages/libndsfpc/examples/graphics/Sprites/sprite_extended_palettes/Makefile.fpc
G packages/libndsfpc/examples/graphics/Printing/ansi_console/Makefile.fpc
G packages/libndsfpc/examples/graphics/Printing/console_windows/Makefile.fpc
G packages/libndsfpc/examples/graphics/Printing/custom_font/Makefile.fpc
G packages/libndsfpc/examples/graphics/Printing/rotscale_text/Makefile.fpc
G packages/libndsfpc/examples/graphics/Printing/print_both_screens/Makefile.fpc
G packages/libndsfpc/examples/audio/maxmod/reverb/Makefile.fpc
G packages/libndsfpc/examples/audio/maxmod/song_events_example/Makefile.fpc
G packages/libndsfpc/examples/audio/maxmod/song_events_example2/Makefile.fpc
G packages/libndsfpc/examples/audio/maxmod/audio_modes/Makefile.fpc
G packages/libndsfpc/examples/audio/maxmod/basic_sound/Makefile.fpc
U packages/libndsfpc/examples/audio/maxmod/streaming/Makefile.fpc
G packages/libndsfpc/examples/audio/micrecord/Makefile.fpc
G packages/libndsfpc/examples/filesystem/libfat/access_dir/Makefile.fpc
G packages/libndsfpc/examples/filesystem/libfat/access_file/Makefile.fpc
G packages/libndsfpc/examples/filesystem/libfat/libfatdir/Makefile.fpc
G packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/Makefile.fpc
G packages/libndsfpc/examples/filesystem/embedded_gbfs/Makefile.fpc
G packages/libndsfpc/examples/dswifi/autoconnect/Makefile.fpc
G packages/libndsfpc/examples/dswifi/ap_search/Makefile.fpc
G packages/libndsfpc/examples/dswifi/httpget/Makefile.fpc
G packages/libndsfpc/examples/gl2d/fonts/Makefile.fpc
G packages/libndsfpc/examples/gl2d/sprites/Makefile.fpc
G packages/libndsfpc/examples/gl2d/primitives/Makefile.fpc
G packages/libndsfpc/examples/gl2d/scrolling/Makefile.fpc
G packages/libndsfpc/examples/gl2d/2Dplus3D/Makefile.fpc
G packages/libndsfpc/examples/gl2d/dual_screen/Makefile.fpc
G packages/libndsfpc/examples/card/eeprom/Makefile.fpc
Summary of conflicts:
Text conflicts: 1
Skipped paths: 1
# revisions: 29600,30008,30074
git-svn-id: branches/fixes_3_0@30170 -
This merge fixes disassembly error from Stack Window
------------------------------------------------------------------------
r30095 | pierre | 2015-03-04 18:37:57 +0100 (Wed, 04 Mar 2015) | 3 lines
Changed paths:
M /trunk/packages/gdbint/src/gdbint.pp
Add missing gdbarch field for annotate_frame_begin for version 7.0 or above
Try to cope with buffering problems to catch complete argument list
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_0@30098 -
------------------------------------------------------------------------
r29667 | pierre | 2015-02-11 00:03:09 +0100 (Wed, 11 Feb 2015) | 1 line
Changed paths:
M /trunk/packages/gdbint/src/gdbcon.pp
Also include gdblib.inc if USE_GDBIBINC macro is set, needed to get USE_MINGW_GDB macro used inside UnixDir
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_0@30096 -
U compiler/psub.pas
A tests/tbs/tb0609.pp
--- Merging r29691 into '.':
U rtl/inc/system.inc
# revisions: 29590,29691
git-svn-id: branches/fixes_3_0@29770 -
U rtl/os2/dos.pas
--- Merging r29668 into '.':
U rtl/os2/sysutils.pp
--- Merging r29669 into '.':
U rtl/os2/sysfile.inc
--- Merging r29700 into '.':
U compiler/systems/t_os2.pas
# revisions: 29666,29668,29669,29700
git-svn-id: branches/fixes_3_0@29767 -
U packages/chm/src/chmwriter.pas
U packages/chm/src/chmfilewriter.pas
U packages/chm/src/chmcmd.lpr
--- Merging r29546 into '.':
U rtl/inc/system.fpd
--- Merging r29547 into '.':
U utils/fpdoc/fpdoc.pp
--- Merging r29548 into '.':
U utils/fpdoc/makeskel.pp
--- Merging r29550 into '.':
G packages/chm/src/chmcmd.lpr
# revisions: 29545,29546,29547,29548,29550
git-svn-id: branches/fixes_3_0@29720 -
U compiler/symtable.pas
A tests/webtbs/tw26483.pp
--- Merging r29484 into '.':
U compiler/nutils.pas
A tests/tbf/tb0250.pp
A tests/webtbs/tw26481.pp
# revisions: 29482,29484
git-svn-id: branches/fixes_3_0@29715 -
C compiler/msgtxt.inc
U compiler/symtable.pas
U compiler/msg/errore.msg
C compiler/msgidx.inc
A tests/test/tobjc41.pp
A tests/test/thlp48.pp
A tests/test/uobjc41.pp
# revisions: 29497,29498
git-svn-id: branches/fixes_3_0@29690 -
U packages/fcl-db/src/sqldb/mssql/mssqlconn.pp
--- Merging r29442 into '.':
U packages/fcl-db/src/base/bufdataset.pas
U packages/fcl-db/src/sqldb/sqldb.pp
--- Merging r29443 into '.':
G packages/fcl-db/src/sqldb/mssql/mssqlconn.pp
G packages/fcl-db/src/sqldb/sqldb.pp
G packages/fcl-db/src/base/bufdataset.pas
U packages/fcl-db/src/base/db.pas
U packages/fcl-db/tests/testsqldb.pas
--- Merging r29448 into '.':
U packages/fcl-db/src/sqldb/sqlite/sqlite3conn.pp
U packages/fcl-db/src/sqldb/mysql/mysqlconn.inc
--- Merging r29451 into '.':
G packages/fcl-db/tests/testsqldb.pas
--- Merging r29462 into '.':
G packages/fcl-db/tests/testsqldb.pas
--- Merging r29479 into '.':
U packages/fcl-db/src/sqldb/postgres/pqconnection.pp
--- Merging r29480 into '.':
G packages/fcl-db/tests/testsqldb.pas
--- Merging r29507 into '.':
G packages/fcl-db/src/sqldb/postgres/pqconnection.pp
--- Merging r29624 into '.':
G packages/fcl-db/src/base/db.pas
U packages/fcl-db/src/base/fields.inc
--- Merging r29638 into '.':
U packages/rtl-unicode/fpmake.pp
U packages/rtl-unicode/src/inc/cpbuildu.pp
A packages/rtl-unicode/src/inc/cp895.pas
A rtl/ucmaps/cp895.txt
--- Merging r29662 into '.':
U packages/fcl-db/src/sqldb/mssql/readme.txt
--- Merging r29679 into '.':
U packages/fcl-db/src/base/dsparams.inc
U packages/fcl-db/src/base/datasource.inc
G packages/fcl-db/tests/testsqldb.pas
# revisions: 29430,29442,29443,29448,29451,29462,29479,29480,29507,29624,29638,29662,29679
git-svn-id: branches/fixes_3_0@29682 -
A tests/test/cg/obj/solaris/i386/tcext6.o
A tests/test/cg/obj/solaris/i386/cpptcl2.o
--- Merging r29536 into '.':
A tests/test/cg/obj/solaris/x86_64/tcext6.o
A tests/test/cg/obj/solaris/x86_64/cpptcl2.o
# revisions: 29535,29536
git-svn-id: branches/fixes_3_0@29661 -
U compiler/systems/t_sunos.pas
--- Merging r29520 into '.':
U compiler/systems/i_sunos.pas
--- Merging r29521 into '.':
G compiler/systems/t_sunos.pas
--- Merging r29647 into '.':
G compiler/systems/t_sunos.pas
--- Merging r29549 into '.':
G compiler/systems/t_sunos.pas
--- Merging r29575 into '.':
G compiler/systems/i_sunos.pas
# revisions: 29501,29520,29521,29647,29549,29575
git-svn-id: branches/fixes_3_0@29658 -
