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 -
U packages/amunits/src/otherlibs/ahi.pas
--- Recording mergeinfo for merge of r30967 into '.':
U .
--- Merging r30974 into '.':
U packages/amunits/src/otherlibs/ptreplay.pas
--- Recording mergeinfo for merge of r30974 into '.':
G .
--- Merging r30976 into '.':
U packages/amunits/src/otherlibs/cybergraphics.pas
--- Recording mergeinfo for merge of r30976 into '.':
G .
--- Merging r30977 into '.':
U packages/amunits/src/otherlibs/picasso96api.pas
--- Recording mergeinfo for merge of r30977 into '.':
G .
--- Merging r30978 into '.':
U packages/amunits/src/utilunits/amsgbox.pas
--- Recording mergeinfo for merge of r30978 into '.':
G .
--- Merging r30979 into '.':
U packages/amunits/src/coreunits/layers.pas
--- Recording mergeinfo for merge of r30979 into '.':
G .
--- Merging r30980 into '.':
U packages/amunits/src/coreunits/amigados.pas
--- Recording mergeinfo for merge of r30980 into '.':
G .
--- Merging r30981 into '.':
U packages/amunits/src/coreunits/exec.pas
--- Recording mergeinfo for merge of r30981 into '.':
G .
--- Merging r30983 into '.':
U packages/amunits/src/coreunits/amigalib.pas
--- Recording mergeinfo for merge of r30983 into '.':
G .
--- Merging r30984 into '.':
U packages/amunits/src/coreunits/intuition.pas
--- Recording mergeinfo for merge of r30984 into '.':
G .
--- Merging r30985 into '.':
U packages/amunits/src/coreunits/rexx.pas
--- Recording mergeinfo for merge of r30985 into '.':
G .
--- Merging r30986 into '.':
U packages/amunits/src/coreunits/utility.pas
--- Recording mergeinfo for merge of r30986 into '.':
G .
--- Merging r30988 into '.':
G packages/amunits/src/coreunits/utility.pas
--- Recording mergeinfo for merge of r30988 into '.':
G .
--- Merging r30989 into '.':
U packages/morphunits/src/iffparse.pas
--- Recording mergeinfo for merge of r30989 into '.':
G .
# revisions: 30967,30974,30976,30977,30978,30979,30980,30981,30983,30984,30985,30986,30988,30989
git-svn-id: branches/fixes_3_0@31095 -
U rtl/objpas/classes/classes.inc
U rtl/objpas/classes/classesh.inc
U rtl/os2/tthread.inc
--- Recording mergeinfo for merge of r29712 into '.':
U .
--- Merging r30941 into '.':
G rtl/objpas/classes/classes.inc
--- Recording mergeinfo for merge of r30941 into '.':
G .
# revisions: 29712,30941
git-svn-id: branches/fixes_3_0@31093 -
A utils/mkinsadd.pp
--- Recording mergeinfo for merge of r29489 into '.':
U .
--- Merging r29490 into '.':
U utils/fpmake.pp
--- Recording mergeinfo for merge of r29490 into '.':
G .
--- Merging r29499 into '.':
U utils/mkinsadd.pp
--- Recording mergeinfo for merge of r29499 into '.':
G .
# revisions: 29489,29490,29499
git-svn-id: branches/fixes_3_0@31092 -
U packages/fcl-web/src/base/restbase.pp
U packages/fcl-web/src/base/restcodegen.pp
--- Recording mergeinfo for merge of r30827 into '.':
U .
--- Merging r30833 into '.':
U packages/fcl-web/src/base/fpwebclient.pp
--- Recording mergeinfo for merge of r30833 into '.':
G .
--- Merging r30834 into '.':
U packages/fcl-web/src/base/fphttpwebclient.pp
--- Recording mergeinfo for merge of r30834 into '.':
G .
--- Merging r30843 into '.':
G packages/fcl-web/src/base/fpwebclient.pp
--- Recording mergeinfo for merge of r30843 into '.':
G .
--- Merging r30868 into '.':
G packages/fcl-web/src/base/restbase.pp
G packages/fcl-web/src/base/restcodegen.pp
--- Recording mergeinfo for merge of r30868 into '.':
G .
--- Merging r31015 into '.':
U packages/fcl-web/src/base/httpdefs.pp
--- Recording mergeinfo for merge of r31015 into '.':
G .
--- Merging r31016 into '.':
U packages/fcl-web/src/base/custcgi.pp
--- Recording mergeinfo for merge of r31016 into '.':
G .
--- Merging r31017 into '.':
G packages/fcl-web/src/base/restbase.pp
--- Recording mergeinfo for merge of r31017 into '.':
G .
--- Merging r31018 into '.':
G packages/fcl-web/src/base/custcgi.pp
U packages/fcl-web/src/base/cgiprotocol.pp
--- Recording mergeinfo for merge of r31018 into '.':
G .
--- Merging r31020 into '.':
G packages/fcl-web/src/base/fpwebclient.pp
--- Recording mergeinfo for merge of r31020 into '.':
G .
--- Merging r31023 into '.':
G packages/fcl-web/src/base/restbase.pp
--- Recording mergeinfo for merge of r31023 into '.':
G .
# revisions: 30827,30833,30834,30843,30868,31015,31016,31017,31018,31020,31023
git-svn-id: branches/fixes_3_0@31090 -
U utils/unicode/fpmake.pp
--- Recording mergeinfo for merge of r29619 into '.':
U .
--- Merging r29642 into '.':
U packages/libcurl/src/libcurl.pp
--- Recording mergeinfo for merge of r29642 into '.':
G .
--- Merging r29645 into '.':
U packages/rtl-objpas/src/inc/variants.pp
--- Recording mergeinfo for merge of r29645 into '.':
G .
--- Merging r29656 into '.':
G packages/rtl-objpas/src/inc/variants.pp
--- Recording mergeinfo for merge of r29656 into '.':
G .
# revisions: 29619,29642,29645,29656
git-svn-id: branches/fixes_3_0@31089 -
U rtl/solaris/Makefile.fpc
U rtl/solaris/Makefile
--- Recording mergeinfo for merge of r29599 into '.':
U .
# revisions: 29599
git-svn-id: branches/fixes_3_0@31085 -
U packages/fcl-process/src/amicommon/process.inc
--- Recording mergeinfo for merge of r30842 into '.':
U .
--- Merging r30860 into '.':
U packages/fcl-process/src/amicommon/simpleipc.inc
--- Recording mergeinfo for merge of r30860 into '.':
G .
--- Merging r30886 into '.':
U rtl/aros/system.pp
--- Recording mergeinfo for merge of r30886 into '.':
G .
--- Merging r30899 into '.':
U rtl/amiga/system.pp
U rtl/morphos/system.pp
U rtl/amicommon/sysfile.inc
G rtl/aros/system.pp
--- Recording mergeinfo for merge of r30899 into '.':
G .
--- Merging r30901 into '.':
A rtl/amiga/m68k/m68kamiga.inc
--- Recording mergeinfo for merge of r30901 into '.':
G .
--- Merging r30902 into '.':
U rtl/amiga/m68k/m68kamiga.inc
--- Recording mergeinfo for merge of r30902 into '.':
G .
--- Merging r30903 into '.':
G rtl/amiga/system.pp
U rtl/m68k/m68k.inc
--- Recording mergeinfo for merge of r30903 into '.':
G .
--- Merging r30904 into '.':
D rtl/morphos/sysosh.inc
--- Recording mergeinfo for merge of r30904 into '.':
G .
--- Merging r30905 into '.':
A rtl/amicommon/athreads.pp
--- Recording mergeinfo for merge of r30905 into '.':
G .
--- Merging r30912 into '.':
U rtl/amicommon/sysosh.inc
U rtl/amicommon/athreads.pp
--- Recording mergeinfo for merge of r30912 into '.':
G .
--- Merging r30913 into '.':
G rtl/amicommon/athreads.pp
--- Recording mergeinfo for merge of r30913 into '.':
G .
--- Merging r30914 into '.':
D rtl/amiga/tthread.inc
U rtl/objpas/classes/classesh.inc
A rtl/amicommon/tthread.inc
D rtl/morphos/tthread.inc
--- Recording mergeinfo for merge of r30914 into '.':
G .
--- Merging r30915 into '.':
U packages/morphunits/src/exec.pas
--- Recording mergeinfo for merge of r30915 into '.':
G .
--- Merging r30916 into '.':
G packages/morphunits/src/exec.pas
--- Recording mergeinfo for merge of r30916 into '.':
G .
--- Merging r30917 into '.':
U rtl/morphos/execd.inc
--- Recording mergeinfo for merge of r30917 into '.':
G .
--- Merging r30921 into '.':
U rtl/amicommon/osdebugh.inc
U rtl/amicommon/osdebug.inc
--- Recording mergeinfo for merge of r30921 into '.':
G .
--- Merging r30922 into '.':
G rtl/amicommon/athreads.pp
--- Recording mergeinfo for merge of r30922 into '.':
G .
--- Merging r30923 into '.':
U rtl/amicommon/sysutils.pp
G rtl/amicommon/sysosh.inc
U rtl/aros/arosthreads.inc
U rtl/aros/systhrd.inc
U rtl/aros/i386/doslibf.inc
U rtl/aros/i386/execf.inc
U rtl/amiga/m68k/doslibf.inc
U rtl/morphos/doslibf.inc
--- Recording mergeinfo for merge of r30923 into '.':
G .
--- Merging r30924 into '.':
G rtl/amicommon/athreads.pp
--- Recording mergeinfo for merge of r30924 into '.':
G .
--- Merging r30933 into '.':
G rtl/amicommon/athreads.pp
--- Recording mergeinfo for merge of r30933 into '.':
G .
--- Merging r30940 into '.':
G rtl/amicommon/athreads.pp
--- Recording mergeinfo for merge of r30940 into '.':
G .
# revisions: 30842,30860,30886,30899,30901,30902,30903,30904,30905,30912,30913,30914,30915,30916,30917,30921,30922,30923,30924,30933,30940
git-svn-id: branches/fixes_3_0@31084 -
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 -
