U rtl/objpas/sysutils/sysutilh.inc
--- Recording mergeinfo for merge of r33362 into '.':
U .
--- Merging r33363 into '.':
U rtl/win/sysutils.pp
--- Recording mergeinfo for merge of r33363 into '.':
G .
--- Merging r33377 into '.':
G rtl/objpas/sysutils/sysutilh.inc
U rtl/objpas/sysutils/sysutils.inc
--- Recording mergeinfo for merge of r33377 into '.':
G .
--- Merging r33378 into '.':
G rtl/objpas/sysutils/sysutilh.inc
G rtl/objpas/sysutils/sysutils.inc
--- Recording mergeinfo for merge of r33378 into '.':
G .
# revisions: 33362,33363,33377,33378
git-svn-id: branches/fixes_3_0@33823 -
U packages/rtl-objpas/src/inc/variants.pp
U rtl/objpas/typinfo.pp
--- Recording mergeinfo for merge of r32858 into '.':
U .
--- Merging r32863 into '.':
G packages/rtl-objpas/src/inc/variants.pp
--- Recording mergeinfo for merge of r32863 into '.':
G .
# revisions: 32858,32863
git-svn-id: branches/fixes_3_0@33822 -
U rtl/inc/system.inc
U rtl/inc/uuchar.pp
U rtl/objpas/classes/reader.inc
U rtl/objpas/classes/parser.inc
U rtl/objpas/classes/classes.inc
U rtl/objpas/sysutils/sysencoding.inc
U rtl/objpas/sysutils/sysformt.inc
U rtl/objpas/typinfo.pp
--- Recording mergeinfo for merge of r31752 into '.':
U .
--- Merging r32167 into '.':
G rtl/inc/system.inc
G rtl/objpas/typinfo.pp
--- Recording mergeinfo for merge of r32167 into '.':
G .
# revisions: 31752,32167
git-svn-id: branches/fixes_3_0@33820 -
G packages/fcl-process/src/unix/simpleipc.inc
--- Recording mergeinfo for merge of r33697 into '.':
G .
# revisions: 33697
git-svn-id: branches/fixes_3_0@33818 -
U rtl/inc/lnfodwrf.pp
--- Recording mergeinfo for merge of r30638 into '.':
U .
--- Merging r32919 into '.':
G rtl/inc/lnfodwrf.pp
--- Recording mergeinfo for merge of r32919 into '.':
G .
# revisions: 30638,32919
git-svn-id: branches/fixes_3_0@33814 -
U packages/rtl-objpas/src/inc/fmtbcd.pp
--- Recording mergeinfo for merge of r32357 into '.':
U .
--- Merging r32358 into '.':
U tests/test/units/fmtbcd/tfmtbcd.pp
--- Recording mergeinfo for merge of r32358 into '.':
G .
--- Merging r32722 into '.':
G packages/rtl-objpas/src/inc/fmtbcd.pp
--- Recording mergeinfo for merge of r32722 into '.':
G .
--- Merging r32723 into '.':
G tests/test/units/fmtbcd/tfmtbcd.pp
--- Recording mergeinfo for merge of r32723 into '.':
G .
# revisions: 32357,32358,32722,32723
git-svn-id: branches/fixes_3_0@33813 -
C tests/Makefile
C tests/Makefile.fpc
--- Recording mergeinfo for merge of r32336 into '.':
U .
Summary of conflicts:
Text conflicts: 2
# revisions: 32336,32357,32358,32722,32723
git-svn-id: branches/fixes_3_0@33812 -
U packages/fcl-db/tests/testbasics.pas
U packages/fcl-db/src/base/dsparams.inc
--- Recording mergeinfo for merge of r33761 into '.':
U .
--- Merging r33778 into '.':
U packages/fcl-image/src/ftfont.pp
--- Recording mergeinfo for merge of r33778 into '.':
G .
--- Merging r33779 into '.':
U packages/fcl-pdf/examples/testfppdf.lpr
U packages/fcl-pdf/src/fppdf.pp
U packages/fcl-pdf/src/fpttf.pp
--- Recording mergeinfo for merge of r33779 into '.':
G .
# revisions: 33761,33778,33779
git-svn-id: branches/fixes_3_0@33811 -
U rtl/win/wininc/base.inc
U rtl/win/wininc/struct.inc
U rtl/win/sysutils.pp
U rtl/objpas/types.pp
U rtl/win32/windows.pp
--- Recording mergeinfo for merge of r32333 into '.':
U .
--- Merging r32335 into '.':
A rtl/inc/typshrdh.inc
A rtl/inc/typshrd.inc
--- Recording mergeinfo for merge of r32335 into '.':
G .
--- Merging r32344 into '.':
U rtl/wince/windows.pp
U rtl/win64/windows.pp
--- Recording mergeinfo for merge of r32344 into '.':
G .
--- Merging r32361 into '.':
G rtl/objpas/types.pp
--- Recording mergeinfo for merge of r32361 into '.':
G .
--- Merging r32362 into '.':
U rtl/wince/wininc/struct.inc
--- Recording mergeinfo for merge of r32362 into '.':
G .
--- Merging r32456 into '.':
G rtl/win/wininc/base.inc
--- Recording mergeinfo for merge of r32456 into '.':
G .
--- Merging r32692 into '.':
G rtl/win/sysutils.pp
G rtl/win/wininc/struct.inc
--- Recording mergeinfo for merge of r32692 into '.':
G .
--- Merging r32998 into '.':
U rtl/inc/typshrd.inc
U rtl/inc/typshrdh.inc
--- Recording mergeinfo for merge of r32998 into '.':
G .
--- Merging r33018 into '.':
G rtl/wince/wininc/struct.inc
--- Recording mergeinfo for merge of r33018 into '.':
G .
--- Merging r33062 into '.':
G rtl/inc/typshrd.inc
G rtl/inc/typshrdh.inc
--- Recording mergeinfo for merge of r33062 into '.':
G .
--- Merging r33143 into '.':
G rtl/win/wininc/base.inc
U rtl/win/wininc/ascfun.inc
G rtl/win/wininc/struct.inc
U rtl/win/wininc/unifun.inc
--- Recording mergeinfo for merge of r33143 into '.':
G .
--- Merging r33216 into '.':
G rtl/win/wininc/struct.inc
G rtl/win/wininc/unifun.inc
G rtl/win/wininc/base.inc
U rtl/win/wininc/unidef.inc
G rtl/win/wininc/ascfun.inc
--- Recording mergeinfo for merge of r33216 into '.':
G .
--- Merging r33217 into '.':
G rtl/win/wininc/struct.inc
G rtl/win/wininc/unifun.inc
G rtl/win/wininc/ascfun.inc
--- Recording mergeinfo for merge of r33217 into '.':
G .
--- Merging r33227 into '.':
U rtl/win/wininc/defines.inc
G rtl/win/wininc/struct.inc
G rtl/win/wininc/unifun.inc
--- Recording mergeinfo for merge of r33227 into '.':
G .
# revisions: 32333,32335,32344,32361,32362,32456,32692,32998,33018,33062,33143,33216,33217,33227
git-svn-id: branches/fixes_3_0@33790 -
U utils/tply/lextable.pas
U utils/tply/plex.pas
--- Recording mergeinfo for merge of r32264 into '.':
G .
# revisions: 32264
git-svn-id: branches/fixes_3_0@33789 -
U packages/hash/src/md5.pp
--- Recording mergeinfo for merge of r32795 into '.':
U .
--- Merging r32804 into '.':
U packages/openssl/src/openssl.pas
--- Recording mergeinfo for merge of r32804 into '.':
G .
--- Merging r32805 into '.':
U packages/openssl/examples/test1.pas
--- Recording mergeinfo for merge of r32805 into '.':
G .
--- Merging r32806 into '.':
U packages/fcl-fpcunit/src/demo/consolerunner/testrunner.pp
U packages/fcl-fpcunit/src/fpcunit.pp
--- Recording mergeinfo for merge of r32806 into '.':
G .
--- Merging r32809 into '.':
U utils/fpdoc/fpdoc.pp
--- Recording mergeinfo for merge of r32809 into '.':
G .
--- Merging r32814 into '.':
U packages/rtl-unicode/src/collations/collation_zh_be.inc
U packages/rtl-unicode/src/collations/collation_es_le.inc
U packages/rtl-unicode/src/collations/collation_ko_le.inc
U packages/rtl-unicode/src/collations/collation_zh.pas
U packages/rtl-unicode/src/collations/collation_ru_be.inc
U packages/rtl-unicode/src/collations/collation_sv_be.inc
U packages/rtl-unicode/src/collations/collation_ja_be.inc
U packages/rtl-unicode/src/collations/collation_ru.pas
U packages/rtl-unicode/src/collations/collation_zh_le.inc
U packages/rtl-unicode/src/collations/collation_de.pas
U packages/rtl-unicode/src/collations/collation_sv.pas
U packages/rtl-unicode/src/collations/collation_ja.pas
U packages/rtl-unicode/src/collations/collation_ru_le.inc
U packages/rtl-unicode/src/collations/collation_sv_le.inc
U packages/rtl-unicode/src/collations/collation_ja_le.inc
U packages/rtl-unicode/src/collations/collation_es_be.inc
U packages/rtl-unicode/src/collations/collation_ko_be.inc
U packages/rtl-unicode/src/collations/collation_es.pas
U packages/rtl-unicode/src/collations/collation_ko.pas
U packages/rtl-unicode/src/collations/collation_fr_ca.pas
U packages/rtl-unicode/src/inc/ucadata.inc
U packages/rtl-unicode/src/inc/ucadata_le.inc
U packages/rtl-unicode/src/inc/ucadata_be.inc
--- Recording mergeinfo for merge of r32814 into '.':
G .
--- Merging r32820 into '.':
U packages/winunits-jedi/src/jwaactivex.pas
U rtl/objpas/types.pp
U rtl/objpas/classes/classesh.inc
U rtl/objpas/classes/streams.inc
--- Recording mergeinfo for merge of r32820 into '.':
G .
--- Merging r32826 into '.':
U packages/fcl-process/src/process.pp
--- Recording mergeinfo for merge of r32826 into '.':
G .
--- Merging r32860 into '.':
U packages/paszlib/examples/miniunz.pas
--- Recording mergeinfo for merge of r32860 into '.':
G .
--- Merging r32861 into '.':
U packages/paszlib/src/zipper.pp
--- Recording mergeinfo for merge of r32861 into '.':
G .
--- Merging r32862 into '.':
A packages/paszlib/examples/fpzipper.lpi
A packages/paszlib/examples/fpunzipper.lpi
A packages/paszlib/examples/fpzipper.lpr
A packages/paszlib/examples/fpunzipper.lpr
--- Recording mergeinfo for merge of r32862 into '.':
G .
--- Merging r32868 into '.':
U packages/fcl-fpcunit/src/consoletestrunner.pas
--- Recording mergeinfo for merge of r32868 into '.':
G .
--- Merging r32891 into '.':
A packages/fcl-process/examples
A packages/fcl-process/examples/demoproject.ico
A packages/fcl-process/examples/demoproject.pp
A packages/fcl-process/examples/demoproject.lpi
A packages/fcl-process/examples/echoparams.pp
A packages/fcl-process/examples/demoproject.res
--- Recording mergeinfo for merge of r32891 into '.':
G .
--- Merging r32892 into '.':
A packages/fcl-process/examples/demoruncommand.lpi
A packages/fcl-process/examples/demoruncommand.pp
--- Recording mergeinfo for merge of r32892 into '.':
G .
--- Merging r32893 into '.':
G packages/fcl-process/src/process.pp
--- Recording mergeinfo for merge of r32893 into '.':
G .
--- Merging r32895 into '.':
G utils/fpdoc/fpdoc.pp
--- Recording mergeinfo for merge of r32895 into '.':
G .
# revisions: 32795,32804,32805,32806,32809,32814,32820,32826,32860,32861,32862,32868,32891,32892,32893,32895
git-svn-id: branches/fixes_3_0@33748 -
U rtl/objpas/classes/stringl.inc
--- Recording mergeinfo for merge of r32629 into '.':
U .
--- Merging r32630 into '.':
G rtl/objpas/classes/stringl.inc
--- Recording mergeinfo for merge of r32630 into '.':
G .
--- Merging r32668 into '.':
U packages/chm/src/chmreader.pas
--- Recording mergeinfo for merge of r32668 into '.':
G .
# revisions: 32629,32630,32668
git-svn-id: branches/fixes_3_0@33674 -
U packages/fcl-db/src/sqldb/sqldb.pp
U packages/fcl-db/src/sqldb/interbase/ibconnection.pp
--- Recording mergeinfo for merge of r33496 into '.':
U .
--- Merging r33534 into '.':
G packages/fcl-db/src/sqldb/sqldb.pp
--- Recording mergeinfo for merge of r33534 into '.':
G .
# revisions: 33496,33534
git-svn-id: branches/fixes_3_0@33663 -
