U packages/fpmkunit/src/fpmkunit.pp
--- Recording mergeinfo for merge of r31944 into '.':
U .
# revisions: 31944
git-svn-id: branches/fixes_3_0@31973 -
C packages/Makefile
U packages/Makefile.fpc
--- Recording mergeinfo for merge of r31400 into '.':
U .
Summary of conflicts:
Text conflicts: 1
Summary of conflicts:
Text conflicts: 1
# revisions: 31400
git-svn-id: branches/fixes_3_0@31971 -
C packages/googleapi
U packages/nvapi/Makefile.fpc
U packages/httpd13/Makefile.fpc
U packages/proj4/Makefile.fpc
U packages/odbc/Makefile.fpc
U packages/openssl/Makefile.fpc
U packages/rtl-unicode/Makefile.fpc
U packages/fcl-sdo/Makefile.fpc
U packages/libcurl/Makefile.fpc
U packages/gtk1/Makefile.fpc
U packages/libndsfpc/Makefile.fpc
U packages/paszlib/Makefile.fpc
U packages/cdrom/Makefile.fpc
U packages/chm/Makefile.fpc
U packages/fppkg/Makefile.fpc
U packages/x11/Makefile.fpc
U packages/regexpr/Makefile.fpc
U packages/zorba/Makefile.fpc
U packages/rtl-objpas/Makefile.fpc
U packages/ldap/Makefile.fpc
U packages/ncurses/Makefile.fpc
U packages/hash/Makefile.fpc
U packages/utmp/Makefile.fpc
U packages/numlib/Makefile.fpc
U packages/ami-extra/Makefile.fpc
U packages/fcl-net/Makefile.fpc
U packages/libogcfpc/Makefile.fpc
U packages/fcl-res/Makefile.fpc
U packages/imlib/Makefile.fpc
U packages/dbus/Makefile.fpc
U packages/imagemagick/Makefile.fpc
U packages/graph/Makefile.fpc
U packages/iosxlocale/Makefile.fpc
U packages/unzip/Makefile.fpc
U packages/postgres/Makefile.fpc
U packages/fcl-fpcunit/Makefile.fpc
U packages/fcl-process/Makefile.fpc
U packages/fcl-image/Makefile.fpc
U packages/os2units/Makefile.fpc
U packages/libxml/Makefile.fpc
U packages/fcl-stl/Makefile.fpc
C packages/libenet
U packages/libpng/Makefile.fpc
U packages/gdbm/Makefile.fpc
U packages/gtk2/Makefile.fpc
U packages/fcl-web/Makefile.fpc
U packages/pcap/Makefile.fpc
U packages/httpd24/Makefile.fpc
U packages/fuse/Makefile.fpc
U packages/amunits/Makefile.fpc
U packages/bzip2/Makefile.fpc
U packages/bfd/Makefile.fpc
U packages/libvlc/Makefile.fpc
U packages/rtl-extra/Makefile.fpc
U packages/rexx/Makefile.fpc
U packages/mad/Makefile.fpc
U packages/libgd/Makefile.fpc
U packages/httpd22/Makefile.fpc
U packages/oggvorbis/Makefile.fpc
U packages/fcl-async/Makefile.fpc
U packages/opengl/Makefile.fpc
U packages/pasjpeg/Makefile.fpc
U packages/morphunits/Makefile.fpc
U packages/fcl-extra/Makefile.fpc
U packages/objcrtl/Makefile.fpc
U packages/syslog/Makefile.fpc
U packages/httpd20/Makefile.fpc
U packages/zlib/Makefile.fpc
U packages/dblib/Makefile.fpc
U packages/ibase/Makefile.fpc
U packages/winunits-base/Makefile.fpc
U packages/mysql/Makefile.fpc
U packages/matroska/Makefile.fpc
U packages/Makefile.fpc
U packages/winunits-jedi/Makefile.fpc
U packages/fpindexer/Makefile.fpc
U packages/univint/Makefile.fpc
U packages/libc/Makefile.fpc
U packages/symbolic/Makefile.fpc
U packages/gnome1/Makefile.fpc
U packages/sqlite/Makefile.fpc
U packages/jni/Makefile.fpc
U packages/sdl/Makefile.fpc
U packages/winceunits/Makefile.fpc
U packages/libtar/Makefile.fpc
U packages/opengles/Makefile.fpc
U packages/fcl-base/Makefile.fpc
U packages/fcl-xml/Makefile.fpc
U packages/aspell/Makefile.fpc
U packages/a52/Makefile.fpc
U packages/fftw/Makefile.fpc
U packages/fcl-json/Makefile.fpc
U packages/ptc/Makefile.fpc
U packages/rtl-console/Makefile.fpc
U packages/ggi/Makefile.fpc
U packages/fv/Makefile.fpc
U packages/opencl/Makefile.fpc
U packages/fastcgi/Makefile.fpc
U packages/gmp/Makefile.fpc
U packages/uuid/Makefile.fpc
U packages/pthreads/Makefile.fpc
U packages/unixutil/Makefile.fpc
U packages/fcl-passrc/Makefile.fpc
U packages/iconvenc/Makefile.fpc
U packages/fcl-registry/Makefile.fpc
U packages/newt/Makefile.fpc
U packages/sndfile/Makefile.fpc
U packages/openal/Makefile.fpc
U packages/pastojs/Makefile.fpc
U packages/oracle/Makefile.fpc
U packages/libgbafpc/Makefile.fpc
U packages/pxlib/Makefile.fpc
U packages/dts/Makefile.fpc
U packages/libsee/Makefile.fpc
U packages/librsvg/Makefile.fpc
U packages/palmunits/Makefile.fpc
U packages/hermes/Makefile.fpc
U packages/xforms/Makefile.fpc
U packages/tcl/Makefile.fpc
U packages/cocoaint/Makefile.fpc
U packages/modplug/Makefile.fpc
U packages/fcl-js/Makefile.fpc
U packages/arosunits/Makefile.fpc
U packages/users/Makefile.fpc
U packages/gdbint/Makefile.fpc
U packages/fpgtk/Makefile.fpc
U packages/lua/Makefile.fpc
U packages/fcl-db/Makefile.fpc
U packages/cairo/Makefile.fpc
U packages/fcl-sound/Makefile.fpc
U packages/svgalib/Makefile.fpc
U utils/fpcmkcfg/Makefile.fpc
U utils/fpcm/Makefile.fpc
U utils/tply/Makefile.fpc
U utils/fppkg/Makefile.fpc
U utils/h2pas/Makefile.fpc
U utils/fpcreslipo/Makefile.fpc
U ide/Makefile.fpc
U utils/fpcres/Makefile.fpc
U utils/Makefile.fpc
U utils/fpmc/Makefile.fpc
U utils/rmwait/Makefile.fpc
U utils/importtl/Makefile.fpc
U utils/pas2js/Makefile.fpc
U utils/dxegen/Makefile.fpc
U utils/debugsvr/Makefile.fpc
U utils/fpcm/Makefile.fpmake.bs.template
U utils/fpdoc/Makefile.fpc
U utils/fprcp/Makefile.fpc
U utils/unicode/Makefile.fpc
U utils/pas2fpm/Makefile.fpc
U utils/fpcm/Makefile.fpmake.template
U utils/mksymbian/Makefile.fpc
U utils/instantfpc/Makefile.fpc
U utils/pas2ut/Makefile.fpc
U utils/pas2jni/Makefile.fpc
--- Recording mergeinfo for merge of r31317 into '.':
U .
Summary of conflicts:
Tree conflicts: 2
Resolved conflicted state of 'packages/googleapi'
Resolved conflicted state of 'packages/libenet'
Summary of conflicts:
Tree conflicts: 0 remaining (and 2 already resolved)
# revisions: 31317
git-svn-id: branches/fixes_3_0@31969 -
U packages/paszlib/src/infcodes.pas
--- Recording mergeinfo for merge of r31953 into '.':
U .
# revisions: 31953
git-svn-id: branches/fixes_3_0@31966 -
U .
--- Recording mergeinfo for merge of r31963 into '.':
G .
--- Recording mergeinfo for merge of r31964 into '.':
G .
Mergeinfo for revisions 31962, 31963, 31964
git-svn-id: branches/fixes_3_0@31965 -
U compiler/widestr.pas
--- Merging (from foreign repository) r31881 into '.':
G compiler/widestr.pas
U compiler/cresstr.pas
U utils/rstconv.pp
# revisions: 31878, 31881
git-svn-id: branches/fixes_3_0@31964 -
* Use "clongdouble" instead of "extended" in libc printf tests.
........
* use cextended instead of clongdouble, so that the tests keeps compiling
for platforms where we don't support the "long double" type
........
git-svn-id: branches/fixes_3_0@31959 -
A packages/fcl-db/src/sqldb/mysql/mysql57conn.pas
--- Recording mergeinfo for merge of r31826 into '.':
U .
# revisions: 31826
git-svn-id: branches/fixes_3_0@31949 -
U packages/fpmkunit/src/fpmkunit.pp
--- Recording mergeinfo for merge of r31906 into '.':
U .
# revisions: 31906
git-svn-id: branches/fixes_3_0@31928 -
U packages/fpmkunit/src/fpmkunit.pp
--- Recording mergeinfo for merge of r31433 into '.':
U .
# revisions: 31433
git-svn-id: branches/fixes_3_0@31927 -
U packages/fpmkunit/src/fpmkunit.pp
--- Recording mergeinfo for merge of r31895 into '.':
U .
# revisions: 31895
git-svn-id: branches/fixes_3_0@31926 -
* android: Fixed ansi-unicode conversion when DefaultSystemCodePage is changed.
........
* Added predefined ICU versions for newer Android version.
* Fixed search of unknown ICU versions.
* Do UTF-8 conversion by RTL if ICU can not be loaded.
........
git-svn-id: branches/fixes_3_0@31917 -
U installer/install.dat
--- Recording mergeinfo for merge of r31669 into '.':
U .
--- Merging r31671 into '.':
U installer/install.pas
--- Recording mergeinfo for merge of r31671 into '.':
G .
# revisions: 31669,31671
git-svn-id: branches/fixes_3_0@31897 -
------------------------------------------------------------------------
r30573 | pierre | 2015-04-13 18:40:27 +0200 (Mon, 13 Apr 2015) | 1 line
Changed paths:
M /trunk/ide/wini.pas
Use pascal style doubling of quote char instead of C style escaping for ini file
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_0@31754 -
U compiler/ptype.pas
A tests/webtbs/tw28530.pp
--- Recording mergeinfo for merge of r31437 into '.':
U .
# revisions: 31437
git-svn-id: branches/fixes_3_0@31598 -
U compiler/x86_64/cpupara.pas
A tests/webtbs/tw27658.pp
--- Recording mergeinfo for merge of r30239 into '.':
U .
# revisions: 30239
git-svn-id: branches/fixes_3_0@31597 -
U utils/fpcmkcfg/fpccfg.inc
U utils/fpcmkcfg/fpc.cft
--- Recording mergeinfo for merge of r31453 into '.':
U .
# revisions: 31453
git-svn-id: branches/fixes_3_0@31557 -
U utils/fpcmkcfg/fpccfg.inc
U utils/fpcmkcfg/fpc.cft
--- Recording mergeinfo for merge of r31372 into '.':
U .
# revisions: 31372
git-svn-id: branches/fixes_3_0@31556 -
U packages/fcl-db/src/sqldb/mysql/mysqlconn.inc
--- Recording mergeinfo for merge of r31306 into '.':
U .
# revisions: 31306
git-svn-id: branches/fixes_3_0@31554 -
U packages/rtl-objpas/src/inc/dateutil.inc
--- Recording mergeinfo for merge of r31349 into '.':
U .
# revisions: 31349
git-svn-id: branches/fixes_3_0@31553 -
U rtl/objpas/sysutils/sysutils.inc
U rtl/objpas/sysutils/sysutilh.inc
--- Recording mergeinfo for merge of r30140 into '.':
U .
--- Merging r30153 into '.':
U rtl/objpas/classes/classes.inc
--- Recording mergeinfo for merge of r30153 into '.':
G .
--- Merging r30159 into '.':
G rtl/objpas/classes/classes.inc
--- Recording mergeinfo for merge of r30159 into '.':
G .
--- Merging r30551 into '.':
G rtl/objpas/sysutils/sysutilh.inc
U rtl/inc/system.inc
U rtl/inc/systemh.inc
--- Recording mergeinfo for merge of r30551 into '.':
G .
--- Merging r30555 into '.':
G rtl/objpas/sysutils/sysutils.inc
G rtl/inc/systemh.inc
G rtl/inc/system.inc
--- Recording mergeinfo for merge of r30555 into '.':
G .
--- Merging r31185 into '.':
U rtl/objpas/sysutils/dati.inc
U rtl/objpas/sysutils/datih.inc
--- Recording mergeinfo for merge of r31185 into '.':
G .
--- Merging r31265 into '.':
U packages/fcl-json/src/jsonconf.pp
--- Recording mergeinfo for merge of r31265 into '.':
G .
--- Merging r31272 into '.':
G packages/fcl-json/src/jsonconf.pp
--- Recording mergeinfo for merge of r31272 into '.':
G .
--- Merging r31273 into '.':
G packages/fcl-json/src/jsonconf.pp
--- Recording mergeinfo for merge of r31273 into '.':
G .
--- Merging r31277 into '.':
G packages/fcl-json/src/jsonconf.pp
--- Recording mergeinfo for merge of r31277 into '.':
G .
# revisions: 30140,30153,30159,30551,30555,31185,31265,31272,31273,31277
git-svn-id: branches/fixes_3_0@31280 -
U packages/fv/src/platform.inc
--- Recording mergeinfo for merge of r31207 into '.':
U .
--- Merging r31208 into '.':
U rtl/dragonfly/x86_64/dllprt0.as
U rtl/dragonfly/x86_64/cprt0.as
--- Recording mergeinfo for merge of r31208 into '.':
G .
--- Merging r31209 into '.':
U rtl/bsd/bunxsysc.inc
--- Recording mergeinfo for merge of r31209 into '.':
G .
--- Merging r31211 into '.':
A packages/rtl-extra/src/dragonfly
A packages/rtl-extra/src/dragonfly/unxsockh.inc
A packages/rtl-extra/src/dragonfly/unixsock.inc
--- Recording mergeinfo for merge of r31211 into '.':
G .
--- Merging r31212 into '.':
U packages/rtl-extra/src/unix/ipc.pp
--- Recording mergeinfo for merge of r31212 into '.':
G .
--- Merging r31213 into '.':
U packages/rtl-extra/src/bsd/ipcbsd.inc
--- Recording mergeinfo for merge of r31213 into '.':
G .
# revisions: 31207,31208,31209,31211,31212,31213
git-svn-id: branches/fixes_3_0@31279 -
U packages/fcl-db/src/sqldb/odbc/odbcconn.pas
--- Recording mergeinfo for merge of r31200 into '.':
U .
--- Merging r31215 into '.':
U packages/fcl-db/src/sqldb/sqlite/sqlite3conn.pp
--- Recording mergeinfo for merge of r31215 into '.':
G .
--- Merging r31218 into '.':
U packages/mysql/fpmake.pp
A packages/mysql/src/mysql57dyn.pp
U packages/mysql/src/mysql.inc
--- Recording mergeinfo for merge of r31218 into '.':
G .
--- Merging r31220 into '.':
U packages/fcl-db/tests/sqldbtoolsunit.pas
U packages/fcl-db/src/sqldb/mysql/Makefile.fpc
U packages/fcl-db/src/sqldb/mysql/mysqlconn.inc
--- Recording mergeinfo for merge of r31220 into '.':
G .
--- Merging r31235 into '.':
U packages/fcl-passrc/src/pastree.pp
--- Recording mergeinfo for merge of r31235 into '.':
G .
--- Merging r31243 into '.':
U packages/fcl-db/tests/tcsdfdata.pp
U packages/fcl-db/src/sdf/sdfdata.pp
--- Recording mergeinfo for merge of r31243 into '.':
G .
--- Merging r31266 into '.':
G packages/fcl-db/src/sqldb/mysql/mysqlconn.inc
--- Recording mergeinfo for merge of r31266 into '.':
G .
# revisions: 31200,31215,31218,31220,31235,31243,31266
git-svn-id: branches/fixes_3_0@31278 -
C rtl/objpas/math.pp
--- Recording mergeinfo for merge of r31034 into '.':
U .
Summary of conflicts:
Text conflicts: 1
# revisions: 31034
git-svn-id: branches/fixes_3_0@31276 -
C rtl/inc/system.fpd
--- Recording mergeinfo for merge of r31033 into '.':
U .
Summary of conflicts:
Text conflicts: 1
# revisions: 31033
git-svn-id: branches/fixes_3_0@31275 -
U packages/fcl-db/tests/testspecifictbufdataset.pas
U packages/fcl-db/src/sqldb/sqldb.pp
U packages/fcl-db/src/base/bufdataset.pas
--- Recording mergeinfo for merge of r31146 into '.':
U .
--- Merging r31153 into '.':
U packages/odbc/src/odbcsql.inc
--- Recording mergeinfo for merge of r31153 into '.':
G .
--- Merging r31154 into '.':
A packages/fcl-db/examples/createsql.pas
A packages/fcl-db/examples/createsql.lpi
--- Recording mergeinfo for merge of r31154 into '.':
G .
--- Merging r31155 into '.':
U packages/fcl-db/src/base/dsparams.inc
U packages/fcl-db/tests/testbasics.pas
--- Recording mergeinfo for merge of r31155 into '.':
G .
--- Merging r31156 into '.':
U packages/fcl-db/src/base/dbconst.pas
--- Recording mergeinfo for merge of r31156 into '.':
G .
--- Merging r31157 into '.':
G packages/fcl-db/src/sqldb/sqldb.pp
--- Recording mergeinfo for merge of r31157 into '.':
G .
--- Merging r31158 into '.':
U packages/fcl-db/src/sqldb/mssql/mssqlconn.pp
U packages/fcl-db/src/sqldb/sqlite/sqlite3conn.pp
U packages/fcl-db/src/sqldb/mysql/mysqlconn.inc
U packages/fcl-db/src/sqldb/oracle/oracleconnection.pp
U packages/fcl-db/src/sqldb/postgres/pqconnection.pp
U packages/fcl-db/src/sqldb/interbase/ibconnection.pp
--- Recording mergeinfo for merge of r31158 into '.':
G .
--- Merging r31159 into '.':
G packages/fcl-db/src/sqldb/mssql/mssqlconn.pp
G packages/fcl-db/src/sqldb/sqlite/sqlite3conn.pp
--- Recording mergeinfo for merge of r31159 into '.':
G .
--- Merging r31160 into '.':
A packages/fcl-db/examples/logsqldemo.pas
A packages/fcl-db/examples/logsqldemo.lpi
--- Recording mergeinfo for merge of r31160 into '.':
G .
--- Merging r31161 into '.':
U packages/fcl-db/examples/logsqldemo.pas
--- Recording mergeinfo for merge of r31161 into '.':
G .
# revisions: 31146,31153,31154,31155,31156,31157,31158,31159,31160,31161
git-svn-id: branches/fixes_3_0@31274 -
U .
--- Recording mergeinfo for merge of r31184 into '.':
U .
--- Recording mergeinfo for merge of r31205 into '.':
U .
--- Merging r31259 into '.':
U packages/fcl-passrc/src/pparser.pp
U packages/fcl-passrc/tests/tctypeparser.pas
--- Recording mergeinfo for merge of r31259 into '.':
U .
# revisions: 31183,31184,31205,21235,31259
git-svn-id: branches/fixes_3_0@31271 -
A tests/test/tgeneric98.pp
U compiler/ptype.pas
--- Recording mergeinfo for merge of r29485 into '.':
U .
# revisions: 29485
git-svn-id: branches/fixes_3_0@31270 -
U packages/fcl-passrc/src/pparser.pp
U packages/fcl-passrc/src/pastree.pp
U packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r31168 into '.':
U .
--- Merging r31226 into '.':
U packages/fcl-passrc/tests/tctypeparser.pas
U packages/fcl-passrc/tests/tcprocfunc.pas
U packages/fcl-passrc/tests/testpassrc.lpi
U packages/fcl-passrc/tests/tcbaseparser.pas
G packages/fcl-passrc/src/pastree.pp
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r31226 into '.':
G .
--- Merging r31228 into '.':
G packages/fcl-passrc/src/pastree.pp
--- Recording mergeinfo for merge of r31228 into '.':
G .
--- Merging r31229 into '.':
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r31229 into '.':
G .
--- Merging r31230 into '.':
U utils/fpdoc/mkfpdoc.pp
--- Recording mergeinfo for merge of r31230 into '.':
G .
--- Merging r31231 into '.':
U utils/fpdoc/makeskel.pp
--- Recording mergeinfo for merge of r31231 into '.':
G .
--- Merging r31232 into '.':
U utils/fpdoc/dw_html.pp
--- Recording mergeinfo for merge of r31232 into '.':
G .
--- Merging r31233 into '.':
U utils/fpdoc/dglobals.pp
--- Recording mergeinfo for merge of r31233 into '.':
G .
--- Merging r31234 into '.':
U utils/fpdoc/testunit.pp
A utils/fpdoc/gentest.sh
U utils/fpdoc/testunit.xml
--- Recording mergeinfo for merge of r31234 into '.':
G .
# revisions: 31168,31226,31228,31229,31230,31231,31232,31233,31234
git-svn-id: branches/fixes_3_0@31269 -
