U packages/fcl-db/src/sqldb/sqldb.pp
--- Recording mergeinfo for merge of r34573 into '.':
U .
--- Merging r34605 into '.':
U packages/fcl-db/src/sqldb/odbc/odbcconn.pas
--- Recording mergeinfo for merge of r34605 into '.':
G .
--- Merging r34900 into '.':
U packages/fcl-db/src/base/fields.inc
--- Recording mergeinfo for merge of r34900 into '.':
G .
--- Merging r34564 into '.':
U packages/fcl-db/src/base/dsparams.inc
--- Recording mergeinfo for merge of r34564 into '.':
G .
--- Merging r34216 into '.':
U packages/dblib/src/dblib.pp
--- Recording mergeinfo for merge of r34216 into '.':
G .
--- Merging r34094 into '.':
U packages/mysql/src/mysql.inc
--- Recording mergeinfo for merge of r34094 into '.':
G .
--- Merging r34093 into '.':
U packages/fcl-db/tests/sqldbtoolsunit.pas
U packages/fcl-db/tests/toolsunit.pas
--- Recording mergeinfo for merge of r34093 into '.':
G .
--- Merging r34101 into '.':
U packages/fcl-db/tests/testfieldtypes.pas
--- Recording mergeinfo for merge of r34101 into '.':
G .
# revisions: 34573,34605,34900,34564,34216,34094,34093,34101
git-svn-id: branches/fixes_3_0@35345 -
U packages/rtl-objpas/src/inc/strutils.pp
--- Recording mergeinfo for merge of r35327 into '.':
U .
# revisions: 35327
git-svn-id: branches/fixes_3_0@35328 -
U packages/openssl/src/openssl.pas
U packages/openssl/src/fpopenssl.pp
--- Recording mergeinfo for merge of r35324 into '.':
U .
# revisions: 35324
git-svn-id: branches/fixes_3_0@35325 -
U packages/fcl-process/src/simpleipc.pp
--- Recording mergeinfo for merge of r34195 into '.':
U .
# revisions: 34195
git-svn-id: branches/fixes_3_0@35320 -
U packages/winunits-base/src/richedit.pp
--- Recording mergeinfo for merge of r33424 into '.':
U .
--- Merging r33432 into '.':
U packages/winunits-base/src/typelib.pas
--- Recording mergeinfo for merge of r33432 into '.':
G .
# revisions: 33424,33432
git-svn-id: branches/fixes_3_0@35319 -
U packages/fcl-base/src/inifiles.pp
--- Recording mergeinfo for merge of r34463 into '.':
U .
--- Merging r34477 into '.':
A packages/paszlib/tests/tczstreamseek.pp
U packages/paszlib/src/zstream.pp
--- Recording mergeinfo for merge of r34477 into '.':
G .
--- Merging r35100 into '.':
U rtl/freebsd/i386/identpatch.sh
--- Recording mergeinfo for merge of r35100 into '.':
G .
--- Merging r35193 into '.':
U rtl/gba/sysutils.pp
U rtl/nds/sysutils.pp
--- Recording mergeinfo for merge of r35193 into '.':
G .
# revisions: 34463,34477,35100,35193
git-svn-id: branches/fixes_3_0@35306 -
U packages/winunits-base/src/typelib.pas
--- Recording mergeinfo for merge of r34744 into '.':
U .
# revisions: 34744
git-svn-id: branches/fixes_3_0@35304 -
U packages/winunits-base/src/mmsystem.pp
--- Recording mergeinfo for merge of r35191 into '.':
U .
# revisions: 35191
git-svn-id: branches/fixes_3_0@35303 -
U compiler/systems/i_morph.pas
--- Recording mergeinfo for merge of r31003 into '.':
U .
--- Merging r31004 into '.':
U compiler/systems/t_morph.pas
--- Recording mergeinfo for merge of r31004 into '.':
G .
# revisions: 31003,31004
git-svn-id: branches/fixes_3_0@35302 -
U packages/amunits/src/coreunits/amigalib.pas
--- Recording mergeinfo for merge of r32704 into '.':
U .
# revisions: 32704
git-svn-id: branches/fixes_3_0@35301 -
U packages/amunits/src/coreunits/amigalib.pas
--- Recording mergeinfo for merge of r32699 into '.':
U .
# revisions: 32699
git-svn-id: branches/fixes_3_0@35300 -
C++ instead of Pascal, required by current LLDB versions (which is what
Xcode on macOS uses)
--- Merging r34558 into '.':
U compiler/dbgdwarf.pas
--- Recording mergeinfo for merge of r34558 into '.':
U .
--- Merging r34562 into '.':
G compiler/dbgdwarf.pas
C compiler/msgtxt.inc
C compiler/msgidx.inc
U compiler/globtype.pas
U compiler/msg/errore.msg
--- Recording mergeinfo for merge of r34562 into '.':
G .
git-svn-id: branches/fixes_3_0@35298 -
U rtl/freebsd/Makefile.fpc
C rtl/freebsd/Makefile
--- Recording mergeinfo for merge of r34166 into '.':
U .
Summary of conflicts:
Text conflicts: 1
# revisions: 34166
git-svn-id: branches/fixes_3_0@35273 -
C rtl/netbsd/Makefile
U rtl/netbsd/Makefile.fpc
--- Recording mergeinfo for merge of r34877 into '.':
U .
Summary of conflicts:
Text conflicts: 1
# revisions: 34877
git-svn-id: branches/fixes_3_0@34961 -
C rtl/freebsd/Makefile
U rtl/freebsd/Makefile.fpc
--- Recording mergeinfo for merge of r34876 into '.':
U .
Summary of conflicts:
Text conflicts: 1
# revisions: 34876,34877
git-svn-id: branches/fixes_3_0@34960 -
* pas2jni: Explicitly release JNI local refs while executing method pointers.
........
* pas2jni: Fixed string constant handling after recent changes in FPC.
........
* pas2jni: Fixed invoking of Java event handlers from non-main threads.
........
* pas2jni: Fixed handling of identical names of classes, proctypes when they are defined in different units.
........
* pas2jni: Removed option to create event handler by passing Java method method name as a string. It is not safe, since the target method is treated as unused by Java and the method may be removed from the resulting application.
........
* pas2jni: Reverted r34367 and mark undesired event handler creation "deprecated".
........
git-svn-id: branches/fixes_3_0@34774 -
U rtl/win/wininc/unidef.inc
U rtl/win/wininc/ascdef.inc
--- Recording mergeinfo for merge of r34571 into '.':
U .
# revisions: 34571
git-svn-id: branches/fixes_3_0@34572 -
U packages/fcl-web/src/base/fphttpclient.pp
--- Recording mergeinfo for merge of r34062 into '.':
U .
# revisions: 34062
git-svn-id: branches/fixes_3_0@34108 -
U packages/fcl-web/src/base/fphttpclient.pp
--- Recording mergeinfo for merge of r33846 into '.':
U .
# revisions: 33846
git-svn-id: branches/fixes_3_0@34107 -
U rtl/i386/int64p.inc
A tests/webtbs/tw30240.pp
--- Recording mergeinfo for merge of r34059 into '.':
U .
--- Merging r34088 into '.':
A tests/webtbs/tw30357.pp
U compiler/symtable.pas
--- Recording mergeinfo for merge of r34088 into '.':
G .
# revisions: 34059,34088
git-svn-id: branches/fixes_3_0@34103 -
A tests/webtbs/tw28713b.pp
A tests/webtbs/tw28713.pp
U compiler/nmem.pas
--- Recording mergeinfo for merge of r32602 into '.':
U .
--- Merging r33195 into '.':
G compiler/nmem.pas
--- Recording mergeinfo for merge of r33195 into '.':
git-svn-id: branches/fixes_3_0@34054 -
A tests/webtbs/tw28713b.pp
A tests/webtbs/tw28713.pp
U compiler/nmem.pas
--- Recording mergeinfo for merge of r32602 into '.':
U .
--- Merging r33195 into '.':
G compiler/nmem.pas
--- Recording mergeinfo for merge of r33195 into '.':
git-svn-id: branches/fixes_3_0@34053 -
U packages/rtl-objpas/src/inc/dateutil.inc
--- Recording mergeinfo for merge of r31356 into '.':
U .
# revisions: 31356
git-svn-id: branches/fixes_3_0@34023 -
U rtl/android/cwstring.pp
--- Recording mergeinfo for merge of r32328 into '.':
U .
--- Merging r32345 into '.':
G rtl/android/cwstring.pp
--- Recording mergeinfo for merge of r32345 into '.':
G .
--- Merging r32538 into '.':
G rtl/android/cwstring.pp
--- Recording mergeinfo for merge of r32538 into '.':
G .
# revisions: 32328,32345,32538
git-svn-id: branches/fixes_3_0@33921 -
U packages/fcl-pdf/fpmake.pp
--- Recording mergeinfo for merge of r33917 into '.':
U .
--- Merging r33918 into '.':
U installer/install.dat
--- Recording mergeinfo for merge of r33918 into '.':
G .
# revisions: 33917,33918
git-svn-id: branches/fixes_3_0@33920 -
U rtl/go32v2/dos.pp
U rtl/msdos/dos.pp
U rtl/os2/sysutils.pp
U rtl/os2/dos.pas
U rtl/watcom/dos.pp
--- Recording mergeinfo for merge of r33894 into '.':
U .
# revisions: 33894
git-svn-id: branches/fixes_3_0@33907 -
