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 -
U packages/fcl-image/src/fpreadpng.pp
--- Recording mergeinfo for merge of r30290 into '.':
U .
--- Merging r30296 into '.':
U packages/fcl-image/src/fpwritepng.pp
--- Recording mergeinfo for merge of r30296 into '.':
G .
--- Merging r30690 into '.':
U packages/fcl-image/src/fpreadtiff.pas
--- Recording mergeinfo for merge of r30690 into '.':
G .
--- Merging r30692 into '.':
G packages/fcl-image/src/fpreadtiff.pas
--- Recording mergeinfo for merge of r30692 into '.':
G .
--- Merging r30696 into '.':
G packages/fcl-image/src/fpwritepng.pp
--- Recording mergeinfo for merge of r30696 into '.':
G .
--- Merging r30697 into '.':
G packages/fcl-image/src/fpwritepng.pp
--- Recording mergeinfo for merge of r30697 into '.':
G .
# revisions: 30290,30296,30690,30692,30696,30697
git-svn-id: branches/fixes_3_0@31106 -
U packages/rtl-console/src/win/crt.pp
--- Recording mergeinfo for merge of r30432 into '.':
U .
# revisions: 30432
git-svn-id: branches/fixes_3_0@31105 -
U packages/graph/src/win32/graph.pp
--- Recording mergeinfo for merge of r29781 into '.':
U .
--- Merging r30246 into '.':
U packages/graph/src/go32v2/graph.pp
U packages/graph/src/go32v2/vesa.inc
--- Recording mergeinfo for merge of r30246 into '.':
G .
--- Merging r30247 into '.':
G packages/graph/src/go32v2/vesa.inc
U packages/graph/src/msdos/vesa.inc
--- Recording mergeinfo for merge of r30247 into '.':
G .
--- Merging r30248 into '.':
G packages/graph/src/go32v2/vesa.inc
G packages/graph/src/msdos/vesa.inc
--- Recording mergeinfo for merge of r30248 into '.':
G .
--- Merging r30249 into '.':
G packages/graph/src/msdos/vesa.inc
U packages/graph/src/msdos/graph.pp
--- Recording mergeinfo for merge of r30249 into '.':
G .
--- Merging r30262 into '.':
G packages/graph/src/msdos/graph.pp
--- Recording mergeinfo for merge of r30262 into '.':
G .
--- Merging r30263 into '.':
G packages/graph/src/msdos/graph.pp
G packages/graph/src/msdos/vesa.inc
--- Recording mergeinfo for merge of r30263 into '.':
G .
--- Merging r30281 into '.':
G packages/graph/src/go32v2/graph.pp
--- Recording mergeinfo for merge of r30281 into '.':
G .
--- Merging r30282 into '.':
G packages/graph/src/go32v2/graph.pp
--- Recording mergeinfo for merge of r30282 into '.':
G .
--- Merging r30283 into '.':
G packages/graph/src/go32v2/graph.pp
--- Recording mergeinfo for merge of r30283 into '.':
G .
--- Merging r30284 into '.':
U packages/graph/src/ptcgraph/ptcgraph.pp
--- Recording mergeinfo for merge of r30284 into '.':
G .
--- Merging r30285 into '.':
G packages/graph/src/msdos/graph.pp
--- Recording mergeinfo for merge of r30285 into '.':
G .
# revisions: 29781,30246,30247,30248,30249,30262,30263,30281,30282,30283,30284,30285
git-svn-id: branches/fixes_3_0@31104 -
U rtl/android/dlandroid.inc
U rtl/win64/signals.pp
U rtl/win64/system.pp
A rtl/win64/buildrtl.lpi
U rtl/x86_64/cpu.pp
--- Recording mergeinfo for merge of r29422 through r29424 into '.':
U .
--- Merging r29438 into '.':
U packages/fpmkunit/src/fpmkunit.pp
--- Recording mergeinfo for merge of r29438 into '.':
G .
--- Merging r29439 into '.':
U packages/fppkg/src/pkgfpmake.pp
U packages/fppkg/src/pkgcommands.pp
U utils/fppkg/fppkg.pp
--- Recording mergeinfo for merge of r29439 into '.':
G .
--- Merging r29603 into '.':
U rtl/atari/Makefile.fpc
U rtl/atari/Makefile
--- Recording mergeinfo for merge of r29603 into '.':
G .
--- Merging r29604 into '.':
U rtl/Makefile.fpc
U rtl/Makefile
--- Recording mergeinfo for merge of r29604 into '.':
G .
--- Merging r29808 into '.':
U rtl/win/sysos.inc
--- Recording mergeinfo for merge of r29808 into '.':
G .
# revisions: 29422-29424,29438,29439,29603,29604,29808
git-svn-id: branches/fixes_3_0@31103 -
U packages/fcl-db/tests/testsqldb.pas
--- Recording mergeinfo for merge of r30795 into '.':
U .
--- Merging r30796 into '.':
U packages/fcl-db/src/sqldb/sqldb.pp
--- Recording mergeinfo for merge of r30796 into '.':
G .
--- Merging r30797 into '.':
G packages/fcl-db/tests/testsqldb.pas
--- Recording mergeinfo for merge of r30797 into '.':
G .
--- Merging r30798 into '.':
G packages/fcl-db/src/sqldb/sqldb.pp
--- Recording mergeinfo for merge of r30798 into '.':
G .
--- Merging r30804 into '.':
U packages/fcl-db/src/sqldb/interbase/ibconnection.pp
--- Recording mergeinfo for merge of r30804 into '.':
G .
--- Merging r30807 into '.':
G packages/fcl-db/src/sqldb/sqldb.pp
--- Recording mergeinfo for merge of r30807 into '.':
G .
--- Merging r30814 into '.':
U packages/fcl-db/src/sqldb/oracle/oracleconnection.pp
--- Recording mergeinfo for merge of r30814 into '.':
G .
--- Merging r30815 into '.':
G packages/fcl-db/src/sqldb/oracle/oracleconnection.pp
--- Recording mergeinfo for merge of r30815 into '.':
G .
--- Merging r30839 into '.':
U packages/fcl-db/src/sqlite/customsqliteds.pas
--- Recording mergeinfo for merge of r30839 into '.':
G .
--- Merging r30845 into '.':
U packages/fcl-db/tests/tcsdfdata.pp
--- Recording mergeinfo for merge of r30845 into '.':
G .
--- Merging r30869 into '.':
U packages/fcl-db/src/base/dbconst.pas
--- Recording mergeinfo for merge of r30869 into '.':
G .
--- Merging r30880 into '.':
U packages/fcl-db/src/base/db.pas
U packages/fcl-db/src/base/fields.inc
--- Recording mergeinfo for merge of r30880 into '.':
G .
--- Merging r30881 into '.':
G packages/fcl-db/src/base/fields.inc
--- Recording mergeinfo for merge of r30881 into '.':
G .
--- Merging r30882 into '.':
G packages/fcl-db/tests/tcsdfdata.pp
U packages/fcl-db/tests/sdfdstoolsunit.pas
U packages/fcl-db/src/sdf/sdfdata.pp
--- Recording mergeinfo for merge of r30882 into '.':
G .
--- Merging r30883 into '.':
G packages/fcl-db/src/sdf/sdfdata.pp
--- Recording mergeinfo for merge of r30883 into '.':
G .
--- Merging r30884 into '.':
U packages/fcl-db/src/sqldb/sqlite/sqlite3conn.pp
--- Recording mergeinfo for merge of r30884 into '.':
G .
--- Merging r30885 into '.':
G packages/fcl-db/src/sqldb/sqlite/sqlite3conn.pp
--- Recording mergeinfo for merge of r30885 into '.':
G .
--- Merging r30887 into '.':
G packages/fcl-db/src/sqlite/customsqliteds.pas
--- Recording mergeinfo for merge of r30887 into '.':
G .
--- Merging r30888 into '.':
G packages/fcl-db/src/sqlite/customsqliteds.pas
--- Recording mergeinfo for merge of r30888 into '.':
G .
--- Merging r30920 into '.':
G packages/fcl-db/src/sqldb/sqldb.pp
--- Recording mergeinfo for merge of r30920 into '.':
G .
--- Merging r30926 into '.':
G packages/fcl-db/src/sqlite/customsqliteds.pas
--- Recording mergeinfo for merge of r30926 into '.':
G .
--- Merging r30927 into '.':
G packages/fcl-db/src/sqlite/customsqliteds.pas
--- Recording mergeinfo for merge of r30927 into '.':
G .
--- Merging r30928 into '.':
G packages/fcl-db/src/sqlite/customsqliteds.pas
--- Recording mergeinfo for merge of r30928 into '.':
G .
--- Merging r30929 into '.':
G packages/fcl-db/src/sqlite/customsqliteds.pas
--- Recording mergeinfo for merge of r30929 into '.':
G .
--- Merging r30935 into '.':
G packages/fcl-db/tests/sdfdstoolsunit.pas
U packages/fcl-db/tests/dbtestframework_gui.lpi
U packages/fcl-db/tests/database.ini.txt
U packages/fcl-db/tests/dbtestframework_gui.lpr
A packages/fcl-db/tests/sqlite3dstoolsunit.pas
--- Recording mergeinfo for merge of r30935 into '.':
G .
--- Merging r31021 into '.':
U packages/fcl-db/src/sqldb/postgres/pqconnection.pp
--- Recording mergeinfo for merge of r31021 into '.':
G .
--- Merging r31024 into '.':
G packages/fcl-db/src/base/db.pas
--- Recording mergeinfo for merge of r31024 into '.':
G .
--- Merging r31027 into '.':
U packages/fcl-db/tests/testspecifictmemdataset.pas
U packages/fcl-db/tests/memdstoolsunit.pas
U packages/fcl-db/src/memds/memds.pp
--- Recording mergeinfo for merge of r31027 into '.':
G .
# revisions: 30795,30796,30797,30798,30804,30807,30814,30815,30839,30845,30869,30880,30881,30882,30883,30884,30885,30887,30888,30920,30926,30927,30928,30929,30935,31021,31024,31027
git-svn-id: branches/fixes_3_0@31102 -
U packages/fcl-fpcunit/src/fpcunit.pp
--- Recording mergeinfo for merge of r30307 into '.':
U .
--- Merging r30308 into '.':
G packages/fcl-fpcunit/src/fpcunit.pp
U packages/fcl-fpcunit/src/DUnitCompatibleInterface.inc
--- Recording mergeinfo for merge of r30308 into '.':
G .
--- Merging r30309 into '.':
U packages/fcl-fpcunit/src/consoletestrunner.pas
--- Recording mergeinfo for merge of r30309 into '.':
G .
--- Merging r30310 into '.':
U packages/fcl-fpcunit/src/tests/frameworktest.pp
--- Recording mergeinfo for merge of r30310 into '.':
G .
--- Merging r30311 into '.':
G packages/fcl-fpcunit/src/fpcunit.pp
--- Recording mergeinfo for merge of r30311 into '.':
G .
--- Merging r30312 into '.':
G packages/fcl-fpcunit/src/fpcunit.pp
--- Recording mergeinfo for merge of r30312 into '.':
G .
--- Merging r30313 into '.':
G packages/fcl-fpcunit/src/fpcunit.pp
--- Recording mergeinfo for merge of r30313 into '.':
G .
--- Merging r30314 into '.':
G packages/fcl-fpcunit/src/fpcunit.pp
--- Recording mergeinfo for merge of r30314 into '.':
G .
--- Merging r30315 into '.':
G packages/fcl-fpcunit/src/DUnitCompatibleInterface.inc
G packages/fcl-fpcunit/src/fpcunit.pp
--- Recording mergeinfo for merge of r30315 into '.':
G .
--- Merging r30316 into '.':
G packages/fcl-fpcunit/src/fpcunit.pp
--- Recording mergeinfo for merge of r30316 into '.':
G .
--- Merging r30317 into '.':
G packages/fcl-fpcunit/src/fpcunit.pp
--- Recording mergeinfo for merge of r30317 into '.':
G .
--- Merging r30318 into '.':
G packages/fcl-fpcunit/src/fpcunit.pp
--- Recording mergeinfo for merge of r30318 into '.':
G .
--- Merging r30319 into '.':
U packages/fcl-fpcunit/src/plaintestreport.pp
--- Recording mergeinfo for merge of r30319 into '.':
G .
--- Merging r30320 into '.':
U packages/fcl-fpcunit/src/tests/asserttest.pp
--- Recording mergeinfo for merge of r30320 into '.':
G .
--- Merging r30321 into '.':
G packages/fcl-fpcunit/src/fpcunit.pp
G packages/fcl-fpcunit/src/tests/asserttest.pp
--- Recording mergeinfo for merge of r30321 into '.':
G .
--- Merging r30322 into '.':
G packages/fcl-fpcunit/src/tests/frameworktest.pp
--- Recording mergeinfo for merge of r30322 into '.':
G .
--- Merging r30360 into '.':
G packages/fcl-fpcunit/src/fpcunit.pp
--- Recording mergeinfo for merge of r30360 into '.':
G .
--- Merging r30361 into '.':
G packages/fcl-fpcunit/src/fpcunit.pp
--- Recording mergeinfo for merge of r30361 into '.':
G .
--- Merging r30362 into '.':
G packages/fcl-fpcunit/src/tests/frameworktest.pp
--- Recording mergeinfo for merge of r30362 into '.':
G .
--- Merging r30363 into '.':
G packages/fcl-fpcunit/src/plaintestreport.pp
G packages/fcl-fpcunit/src/consoletestrunner.pas
U packages/fcl-fpcunit/src/fpcunitreport.pp
--- Recording mergeinfo for merge of r30363 into '.':
G .
--- Merging r30460 into '.':
G packages/fcl-fpcunit/src/fpcunit.pp
--- Recording mergeinfo for merge of r30460 into '.':
G .
--- Merging r30461 into '.':
G packages/fcl-fpcunit/src/fpcunit.pp
--- Recording mergeinfo for merge of r30461 into '.':
G .
# revisions: 30307,30308,30309,30310,30311,30312,30313,30314,30315,30316,30317,30318,30319,30320,30321,30322,30360,30361,30362,30363,30460,30461
git-svn-id: branches/fixes_3_0@31101 -
U packages/rtl-extra/src/aros/sockets.pp
--- Recording mergeinfo for merge of r31009 into '.':
U .
--- Merging r31011 into '.':
U packages/morphunits/src/mui.pas
--- Recording mergeinfo for merge of r31011 into '.':
G .
--- Merging r31012 into '.':
U packages/amunits/src/otherlibs/mui.pas
G packages/morphunits/src/mui.pas
U packages/arosunits/src/mui.pas
--- Recording mergeinfo for merge of r31012 into '.':
G .
--- Merging r31014 into '.':
U packages/amunits/examples/bezier.pas
U packages/amunits/examples/bezier2.pas
--- Recording mergeinfo for merge of r31014 into '.':
G .
# revisions: 31009,31011,31012,31014
git-svn-id: branches/fixes_3_0@31100 -
C rtl/aros/Makefile
U rtl/aros/system.pp
U rtl/aros/Makefile.fpc
D rtl/aros/arosthreads.inc
D rtl/aros/systhrd.inc
D rtl/aros/systemthreadh.inc
D rtl/aros/tthread.inc
U rtl/amicommon/sysosh.inc
U rtl/objpas/classes/classesh.inc
--- Recording mergeinfo for merge of r31008 into '.':
U .
Summary of conflicts:
Text conflicts: 1
# revisions: 31008,31009,31011,31012,31014
git-svn-id: branches/fixes_3_0@31099 -
C rtl/amiga/Makefile
U rtl/amiga/Makefile.fpc
--- Recording mergeinfo for merge of r31006 into '.':
U .
Summary of conflicts:
Text conflicts: 1
# revisions: 31006,31008,31009,31011,31012,31014
git-svn-id: branches/fixes_3_0@31098 -
U rtl/morphos/system.pp
U rtl/amicommon/sysosh.inc
U rtl/amicommon/sysos.inc
U rtl/amiga/system.pp
--- Recording mergeinfo for merge of r30991 into '.':
U .
--- Merging r30992 into '.':
U rtl/amicommon/athreads.pp
--- Recording mergeinfo for merge of r30992 into '.':
G .
--- Merging r30993 into '.':
U packages/rtl-extra/src/amiga/sockets.pp
D packages/rtl-extra/src/morphos
U packages/rtl-extra/fpmake.pp
--- Recording mergeinfo for merge of r30993 into '.':
G .
--- Merging r30994 into '.':
G packages/rtl-extra/src/amiga/sockets.pp
--- Recording mergeinfo for merge of r30994 into '.':
G .
--- Merging r30995 into '.':
U packages/morphunits/src/utility.pas
--- Recording mergeinfo for merge of r30995 into '.':
G .
--- Merging r30996 into '.':
U packages/morphunits/src/exec.pas
--- Recording mergeinfo for merge of r30996 into '.':
G .
--- Merging r30997 into '.':
U packages/morphunits/src/amigalib.pas
--- Recording mergeinfo for merge of r30997 into '.':
G .
--- Merging r30998 into '.':
U packages/amunits/src/coreunits/exec.pas
--- Recording mergeinfo for merge of r30998 into '.':
G .
--- Merging r30999 into '.':
G packages/morphunits/src/amigalib.pas
--- Recording mergeinfo for merge of r30999 into '.':
G .
--- Merging r31000 into '.':
G packages/morphunits/src/exec.pas
--- Recording mergeinfo for merge of r31000 into '.':
G .
--- Merging r31001 into '.':
U packages/amunits/src/coreunits/amigalib.pas
--- Recording mergeinfo for merge of r31001 into '.':
G .
--- Merging r31005 into '.':
U utils/fpcres/fpmake.pp
--- Recording mergeinfo for merge of r31005 into '.':
G .
# revisions: 30991,30992,30993,30994,30995,30996,30997,30998,30999,31000,31001,31005
git-svn-id: branches/fixes_3_0@31097 -
U packages/fastcgi/fpmake.pp
U packages/rtl-extra/fpmake.pp
U packages/rtl-extra/src/morphos/sockets.pp
U packages/fcl-net/fpmake.pp
U packages/fcl-net/src/ssockets.pp
U packages/fcl-web/fpmake.pp
U packages/fcl-web/src/base/fphttpclient.pp
C packages/googleapi
--- Recording mergeinfo for merge of r30990 into '.':
U .
Summary of conflicts:
Tree conflicts: 1
# revisions: 30990,30991,30992,30993,30994,30995,30996,30997,30998,30999,31000,31001
git-svn-id: branches/fixes_3_0@31096 -
