U utils/fpcmkcfg/fpccfg.inc
U utils/fpcmkcfg/fpc.cft
--- Recording mergeinfo for merge of r31372 into '.':
U .
# revisions: 31372
git-svn-id: branches/fixes_3_0@31556 -
U packages/fcl-db/src/sqldb/mysql/mysqlconn.inc
--- Recording mergeinfo for merge of r31306 into '.':
U .
# revisions: 31306
git-svn-id: branches/fixes_3_0@31554 -
U packages/rtl-objpas/src/inc/dateutil.inc
--- Recording mergeinfo for merge of r31349 into '.':
U .
# revisions: 31349
git-svn-id: branches/fixes_3_0@31553 -
U rtl/objpas/sysutils/sysutils.inc
U rtl/objpas/sysutils/sysutilh.inc
--- Recording mergeinfo for merge of r30140 into '.':
U .
--- Merging r30153 into '.':
U rtl/objpas/classes/classes.inc
--- Recording mergeinfo for merge of r30153 into '.':
G .
--- Merging r30159 into '.':
G rtl/objpas/classes/classes.inc
--- Recording mergeinfo for merge of r30159 into '.':
G .
--- Merging r30551 into '.':
G rtl/objpas/sysutils/sysutilh.inc
U rtl/inc/system.inc
U rtl/inc/systemh.inc
--- Recording mergeinfo for merge of r30551 into '.':
G .
--- Merging r30555 into '.':
G rtl/objpas/sysutils/sysutils.inc
G rtl/inc/systemh.inc
G rtl/inc/system.inc
--- Recording mergeinfo for merge of r30555 into '.':
G .
--- Merging r31185 into '.':
U rtl/objpas/sysutils/dati.inc
U rtl/objpas/sysutils/datih.inc
--- Recording mergeinfo for merge of r31185 into '.':
G .
--- Merging r31265 into '.':
U packages/fcl-json/src/jsonconf.pp
--- Recording mergeinfo for merge of r31265 into '.':
G .
--- Merging r31272 into '.':
G packages/fcl-json/src/jsonconf.pp
--- Recording mergeinfo for merge of r31272 into '.':
G .
--- Merging r31273 into '.':
G packages/fcl-json/src/jsonconf.pp
--- Recording mergeinfo for merge of r31273 into '.':
G .
--- Merging r31277 into '.':
G packages/fcl-json/src/jsonconf.pp
--- Recording mergeinfo for merge of r31277 into '.':
G .
# revisions: 30140,30153,30159,30551,30555,31185,31265,31272,31273,31277
git-svn-id: branches/fixes_3_0@31280 -
U packages/fv/src/platform.inc
--- Recording mergeinfo for merge of r31207 into '.':
U .
--- Merging r31208 into '.':
U rtl/dragonfly/x86_64/dllprt0.as
U rtl/dragonfly/x86_64/cprt0.as
--- Recording mergeinfo for merge of r31208 into '.':
G .
--- Merging r31209 into '.':
U rtl/bsd/bunxsysc.inc
--- Recording mergeinfo for merge of r31209 into '.':
G .
--- Merging r31211 into '.':
A packages/rtl-extra/src/dragonfly
A packages/rtl-extra/src/dragonfly/unxsockh.inc
A packages/rtl-extra/src/dragonfly/unixsock.inc
--- Recording mergeinfo for merge of r31211 into '.':
G .
--- Merging r31212 into '.':
U packages/rtl-extra/src/unix/ipc.pp
--- Recording mergeinfo for merge of r31212 into '.':
G .
--- Merging r31213 into '.':
U packages/rtl-extra/src/bsd/ipcbsd.inc
--- Recording mergeinfo for merge of r31213 into '.':
G .
# revisions: 31207,31208,31209,31211,31212,31213
git-svn-id: branches/fixes_3_0@31279 -
U packages/fcl-db/src/sqldb/odbc/odbcconn.pas
--- Recording mergeinfo for merge of r31200 into '.':
U .
--- Merging r31215 into '.':
U packages/fcl-db/src/sqldb/sqlite/sqlite3conn.pp
--- Recording mergeinfo for merge of r31215 into '.':
G .
--- Merging r31218 into '.':
U packages/mysql/fpmake.pp
A packages/mysql/src/mysql57dyn.pp
U packages/mysql/src/mysql.inc
--- Recording mergeinfo for merge of r31218 into '.':
G .
--- Merging r31220 into '.':
U packages/fcl-db/tests/sqldbtoolsunit.pas
U packages/fcl-db/src/sqldb/mysql/Makefile.fpc
U packages/fcl-db/src/sqldb/mysql/mysqlconn.inc
--- Recording mergeinfo for merge of r31220 into '.':
G .
--- Merging r31235 into '.':
U packages/fcl-passrc/src/pastree.pp
--- Recording mergeinfo for merge of r31235 into '.':
G .
--- Merging r31243 into '.':
U packages/fcl-db/tests/tcsdfdata.pp
U packages/fcl-db/src/sdf/sdfdata.pp
--- Recording mergeinfo for merge of r31243 into '.':
G .
--- Merging r31266 into '.':
G packages/fcl-db/src/sqldb/mysql/mysqlconn.inc
--- Recording mergeinfo for merge of r31266 into '.':
G .
# revisions: 31200,31215,31218,31220,31235,31243,31266
git-svn-id: branches/fixes_3_0@31278 -
C rtl/objpas/math.pp
--- Recording mergeinfo for merge of r31034 into '.':
U .
Summary of conflicts:
Text conflicts: 1
# revisions: 31034
git-svn-id: branches/fixes_3_0@31276 -
C rtl/inc/system.fpd
--- Recording mergeinfo for merge of r31033 into '.':
U .
Summary of conflicts:
Text conflicts: 1
# revisions: 31033
git-svn-id: branches/fixes_3_0@31275 -
U packages/fcl-db/tests/testspecifictbufdataset.pas
U packages/fcl-db/src/sqldb/sqldb.pp
U packages/fcl-db/src/base/bufdataset.pas
--- Recording mergeinfo for merge of r31146 into '.':
U .
--- Merging r31153 into '.':
U packages/odbc/src/odbcsql.inc
--- Recording mergeinfo for merge of r31153 into '.':
G .
--- Merging r31154 into '.':
A packages/fcl-db/examples/createsql.pas
A packages/fcl-db/examples/createsql.lpi
--- Recording mergeinfo for merge of r31154 into '.':
G .
--- Merging r31155 into '.':
U packages/fcl-db/src/base/dsparams.inc
U packages/fcl-db/tests/testbasics.pas
--- Recording mergeinfo for merge of r31155 into '.':
G .
--- Merging r31156 into '.':
U packages/fcl-db/src/base/dbconst.pas
--- Recording mergeinfo for merge of r31156 into '.':
G .
--- Merging r31157 into '.':
G packages/fcl-db/src/sqldb/sqldb.pp
--- Recording mergeinfo for merge of r31157 into '.':
G .
--- Merging r31158 into '.':
U packages/fcl-db/src/sqldb/mssql/mssqlconn.pp
U packages/fcl-db/src/sqldb/sqlite/sqlite3conn.pp
U packages/fcl-db/src/sqldb/mysql/mysqlconn.inc
U packages/fcl-db/src/sqldb/oracle/oracleconnection.pp
U packages/fcl-db/src/sqldb/postgres/pqconnection.pp
U packages/fcl-db/src/sqldb/interbase/ibconnection.pp
--- Recording mergeinfo for merge of r31158 into '.':
G .
--- Merging r31159 into '.':
G packages/fcl-db/src/sqldb/mssql/mssqlconn.pp
G packages/fcl-db/src/sqldb/sqlite/sqlite3conn.pp
--- Recording mergeinfo for merge of r31159 into '.':
G .
--- Merging r31160 into '.':
A packages/fcl-db/examples/logsqldemo.pas
A packages/fcl-db/examples/logsqldemo.lpi
--- Recording mergeinfo for merge of r31160 into '.':
G .
--- Merging r31161 into '.':
U packages/fcl-db/examples/logsqldemo.pas
--- Recording mergeinfo for merge of r31161 into '.':
G .
# revisions: 31146,31153,31154,31155,31156,31157,31158,31159,31160,31161
git-svn-id: branches/fixes_3_0@31274 -
U .
--- Recording mergeinfo for merge of r31184 into '.':
U .
--- Recording mergeinfo for merge of r31205 into '.':
U .
--- Merging r31259 into '.':
U packages/fcl-passrc/src/pparser.pp
U packages/fcl-passrc/tests/tctypeparser.pas
--- Recording mergeinfo for merge of r31259 into '.':
U .
# revisions: 31183,31184,31205,21235,31259
git-svn-id: branches/fixes_3_0@31271 -
A tests/test/tgeneric98.pp
U compiler/ptype.pas
--- Recording mergeinfo for merge of r29485 into '.':
U .
# revisions: 29485
git-svn-id: branches/fixes_3_0@31270 -
U packages/fcl-passrc/src/pparser.pp
U packages/fcl-passrc/src/pastree.pp
U packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r31168 into '.':
U .
--- Merging r31226 into '.':
U packages/fcl-passrc/tests/tctypeparser.pas
U packages/fcl-passrc/tests/tcprocfunc.pas
U packages/fcl-passrc/tests/testpassrc.lpi
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 r31226 into '.':
G .
--- Merging r31228 into '.':
G packages/fcl-passrc/src/pastree.pp
--- Recording mergeinfo for merge of r31228 into '.':
G .
--- Merging r31229 into '.':
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r31229 into '.':
G .
--- Merging r31230 into '.':
U utils/fpdoc/mkfpdoc.pp
--- Recording mergeinfo for merge of r31230 into '.':
G .
--- Merging r31231 into '.':
U utils/fpdoc/makeskel.pp
--- Recording mergeinfo for merge of r31231 into '.':
G .
--- Merging r31232 into '.':
U utils/fpdoc/dw_html.pp
--- Recording mergeinfo for merge of r31232 into '.':
G .
--- Merging r31233 into '.':
U utils/fpdoc/dglobals.pp
--- Recording mergeinfo for merge of r31233 into '.':
G .
--- Merging r31234 into '.':
U utils/fpdoc/testunit.pp
A utils/fpdoc/gentest.sh
U utils/fpdoc/testunit.xml
--- Recording mergeinfo for merge of r31234 into '.':
G .
# revisions: 31168,31226,31228,31229,31230,31231,31232,31233,31234
git-svn-id: branches/fixes_3_0@31269 -
U rtl/objpas/sysutils/datih.inc
--- Recording mergeinfo for merge of r31035 into '.':
U .
--- Merging r31043 into '.':
G rtl/objpas/sysutils/datih.inc
--- Recording mergeinfo for merge of r31043 into '.':
G .
--- Merging r31225 into '.':
U packages/fcl-db/src/sqldb/odbc/odbcconn.pas
--- Recording mergeinfo for merge of r31225 into '.':
G .
# revisions: 31035,31043,31225
git-svn-id: branches/fixes_3_0@31268 -
U rtl/inc/lineinfo.pp
--- Recording mergeinfo for merge of r31025 into '.':
U .
--- Merging r31026 into '.':
G rtl/inc/lineinfo.pp
--- Recording mergeinfo for merge of r31026 into '.':
G .
# revisions: 31025,31026
git-svn-id: branches/fixes_3_0@31216 -
U packages/fcl-passrc/src/pastree.pp
U packages/fcl-passrc/src/pparser.pp
U packages/fcl-passrc/tests/tctypeparser.pas
--- Recording mergeinfo for merge of r31205 into '.':
U .
# revisions: 31205
git-svn-id: branches/fixes_3_0@31206 -
U packages/Makefile
U packages/fpmkunit/src/fpmkunit.pp
U packages/Makefile.fpc
U utils/Makefile.fpc
U utils/Makefile
U ide/Makefile
U ide/Makefile.fpc
--- Recording mergeinfo for merge of r31166 into '.':
U .
# revisions: 31166
git-svn-id: branches/fixes_3_0@31204 -
U rtl/inc/system.fpd
--- Recording mergeinfo for merge of r31182 into '.':
U .
--- Merging r31183 into '.':
U packages/fcl-passrc/tests/testpassrc.lpi
U packages/fcl-passrc/src/pparser.pp
U packages/fcl-passrc/src/pastree.pp
--- Recording mergeinfo for merge of r31183 into '.':
G .
--- Merging r31184 into '.':
U utils/fpdoc/css.inc
U utils/fpdoc/dglobals.pp
U utils/fpdoc/testunit.xml
U utils/fpdoc/fpdoc.lpi
U utils/fpdoc/dw_ipflin.pas
U utils/fpdoc/testunit.pp
U utils/fpdoc/dw_linrtf.pp
U utils/fpdoc/dw_html.pp
U utils/fpdoc/fpdoc.css
U utils/fpdoc/dw_man.pp
U utils/fpdoc/dwlinear.pp
U utils/fpdoc/dw_latex.pp
U utils/fpdoc/dw_txt.pp
--- Recording mergeinfo for merge of r31184 into '.':
G .
# revisions: 31182,31183,31184
git-svn-id: branches/fixes_3_0@31203 -
U packages/rtl-console/src/amicommon/video.pp
--- Recording mergeinfo for merge of r31143 into '.':
U .
--- Merging r31151 into '.':
U rtl/aros/i386/execd.inc
U rtl/amiga/m68k/execd.inc
U rtl/amiga/powerpc/execd.inc
--- Recording mergeinfo for merge of r31151 into '.':
G .
# revisions: 31143,31151
git-svn-id: branches/fixes_3_0@31152 -
U packages/rtl-console/src/amicommon/video.pp
--- Recording mergeinfo for merge of r31141 into '.':
U .
# revisions: 31141
git-svn-id: branches/fixes_3_0@31142 -
U rtl/win/sysos.inc
U rtl/os2/sysos.inc
U rtl/emx/sysos.inc
--- Recording mergeinfo for merge of r29797 into '.':
U .
# revisions: 29797
git-svn-id: branches/fixes_3_0@31128 -
U packages/fcl-db/src/sqldb/sqlite/sqlite3conn.pp
--- Recording mergeinfo for merge of r31086 into '.':
U .
# revisions: 31086
git-svn-id: branches/fixes_3_0@31127 -
U rtl/objpas/sysutils/syspch.inc
A tests/webtbs/tw28089.pp
--- Recording mergeinfo for merge of r30858 into '.':
U .
# revisions: 30858
git-svn-id: branches/fixes_3_0@31125 -
U rtl/objpas/typinfo.pp
A tests/tbs/tb610.pp
--- Recording mergeinfo for merge of r30141 into '.':
U .
# revisions: 30141
git-svn-id: branches/fixes_3_0@31124 -
U packages/fcl-base/src/inifiles.pp
--- Recording mergeinfo for merge of r30623 into '.':
U .
--- Merging r31022 into '.':
U packages/fcl-base/src/streamex.pp
U rtl/objpas/rtlconst.inc
--- Recording mergeinfo for merge of r31022 into '.':
G .
# revisions: 30623,31022
git-svn-id: branches/fixes_3_0@31123 -
U rtl/os2/system.pas
U rtl/netware/system.pp
U rtl/atari/system.pp
U rtl/msdos/system.pp
U rtl/watcom/system.pp
U rtl/netwlibc/system.pp
U rtl/java/system.pp
U rtl/go32v2/system.pp
U rtl/palmos/system.pp
--- Recording mergeinfo for merge of r30025 into '.':
U .
# revisions: 30025
git-svn-id: branches/fixes_3_0@31122 -
U packages/zlib/src/zlib.pp
--- Recording mergeinfo for merge of r29524 into '.':
U .
--- Merging r29525 into '.':
G packages/zlib/src/zlib.pp
--- Recording mergeinfo for merge of r29525 into '.':
G .
# revisions: 29524,29525
git-svn-id: branches/fixes_3_0@31121 -
U compiler/systems/i_amiga.pas
U compiler/systems/t_amiga.pas
--- Recording mergeinfo for merge of r31007 into '.':
U .
# revisions: 31007
git-svn-id: branches/fixes_3_0@31120 -
U rtl/linux/Makefile
U rtl/linux/Makefile.fpc
--- Recording mergeinfo for merge of r30076 into '.':
U .
# revisions: 30076
git-svn-id: branches/fixes_3_0@31118 -
U rtl/objpas/classes/classesh.inc
U rtl/objpas/classes/stringl.inc
--- Recording mergeinfo for merge of r30300 into '.':
U .
--- Merging r30301 into '.':
G rtl/objpas/classes/stringl.inc
G rtl/objpas/classes/classesh.inc
--- Recording mergeinfo for merge of r30301 into '.':
G .
--- Merging r30302 into '.':
G rtl/objpas/classes/stringl.inc
--- Recording mergeinfo for merge of r30302 into '.':
G .
--- Merging r30367 into '.':
U rtl/objpas/classes/reader.inc
G rtl/objpas/classes/classesh.inc
U rtl/objpas/classes/writer.inc
--- Recording mergeinfo for merge of r30367 into '.':
G .
--- Merging r30368 into '.':
U rtl/unix/timezone.inc
--- Recording mergeinfo for merge of r30368 into '.':
G .
--- Merging r30628 into '.':
U packages/rtl-objpas/src/inc/dateutil.inc
--- Recording mergeinfo for merge of r30628 into '.':
G .
# revisions: 30300,30301,30302,30367,30368,30628
git-svn-id: branches/fixes_3_0@31117 -
U packages/ncurses/examples/tclock.pp
U packages/ncurses/examples/tnlshello.pp
U packages/ncurses/examples/t2form.pp
U packages/ncurses/examples/t3form.pp
--- Recording mergeinfo for merge of r31115 into '.':
U .
# revisions: 31115
git-svn-id: branches/fixes_3_0@31116 -
U packages/ncurses/src/ncurses.pp
--- Recording mergeinfo for merge of r30280 into '.':
U .
--- Merging r30288 into '.':
U packages/ncurses/examples/tnlshello.pp
U packages/ncurses/examples/t1panel.pp
U packages/ncurses/examples/t2form.pp
U packages/ncurses/examples/t2menu.pp
U packages/ncurses/examples/t3form.pp
U packages/ncurses/examples/tclock.pp
--- Recording mergeinfo for merge of r30288 into '.':
G .
# revisions: 30280,30288
git-svn-id: branches/fixes_3_0@31114 -
U packages/chm/src/fasthtmlparser.pas
--- Recording mergeinfo for merge of r30258 into '.':
U .
--- Merging r30292 into '.':
U rtl/objpas/classes/streams.inc
--- Recording mergeinfo for merge of r30292 into '.':
G .
--- Merging r30327 into '.':
U packages/winunits-base/src/imm_dyn.pas
U packages/winunits-base/src/imm.pas
--- Recording mergeinfo for merge of r30327 into '.':
G .
--- Merging r30618 into '.':
U utils/fpmake.pp
--- Recording mergeinfo for merge of r30618 into '.':
G .
--- Merging r30621 into '.':
U rtl/linux/linux.pp
--- Recording mergeinfo for merge of r30621 into '.':
G .
--- Merging r30332 into '.':
U rtl/openbsd/ptypes.inc
--- Recording mergeinfo for merge of r30332 into '.':
G .
--- Merging r30333 into '.':
G rtl/openbsd/ptypes.inc
--- Recording mergeinfo for merge of r30333 into '.':
G .
--- Merging r30365 into '.':
U packages/regexpr/src/regexpr.pas
--- Recording mergeinfo for merge of r30365 into '.':
G .
# revisions: 30258,30292,30327,30618,30621,30332,30333,30365
git-svn-id: branches/fixes_3_0@31113 -
U rtl/unix/dos.pp
--- Recording mergeinfo for merge of r30728 into '.':
U .
--- Merging r30704 into '.':
U rtl/objpas/sysutils/sysuintf.inc
--- Recording mergeinfo for merge of r30704 into '.':
G .
--- Merging r30652 into '.':
U packages/cdrom/src/cdrom.pp
--- Recording mergeinfo for merge of r30652 into '.':
G .
--- Merging r30642 into '.':
U packages/rtl-objpas/src/inc/strutils.pp
--- Recording mergeinfo for merge of r30642 into '.':
G .
# revisions: 30728,30704,30652,30642
git-svn-id: branches/fixes_3_0@31112 -
U packages/fcl-json/src/jsonconf.pp
--- Recording mergeinfo for merge of r30260 into '.':
U .
--- Merging r30294 into '.':
U packages/fcl-res/src/versionresource.pp
--- Recording mergeinfo for merge of r30294 into '.':
G .
--- Merging r30303 into '.':
U packages/fcl-process/src/simpleipc.pp
--- Recording mergeinfo for merge of r30303 into '.':
G .
--- Merging r30304 into '.':
U packages/fcl-process/src/unix/simpleipc.inc
--- Recording mergeinfo for merge of r30304 into '.':
G .
# revisions: 30260,30294,30303,30304
git-svn-id: branches/fixes_3_0@31111 -
U rtl/msdos/Makefile
U rtl/msdos/Makefile.fpc
--- Recording mergeinfo for merge of r30145 into '.':
U .
--- Merging r30148 into '.':
G rtl/msdos/Makefile
G rtl/msdos/Makefile.fpc
--- Recording mergeinfo for merge of r30148 into '.':
G .
# revisions: 30145,30148
git-svn-id: branches/fixes_3_0@31110 -
U rtl/linux/Makefile.fpc
U rtl/linux/Makefile
--- Recording mergeinfo for merge of r30122 into '.':
U .
--- Merging r30131 into '.':
U rtl/i386/makefile.cpu
--- Recording mergeinfo for merge of r30131 into '.':
G .
--- Merging r30132 into '.':
U rtl/x86_64/makefile.cpu
--- Recording mergeinfo for merge of r30132 into '.':
G .
# revisions: 30122,30131,30132
git-svn-id: branches/fixes_3_0@31109 -
