U packages/fcl-db/src/base/dataset.inc
--- Recording mergeinfo for merge of r36812 into '.':
U .
# revisions: 36812
git-svn-id: branches/fixes_3_0@38405 -
U compiler/COPYING.txt
U packages/gtk2/src/glib/gparamspecs.inc
U packages/gtk2/src/gtk+/gdk/gdki18n.inc
U packages/gtk2/src/gtk+/gdk/gdkprivate.inc
U packages/gtk2/src/gtk+/gtk/gtkhsv.inc
U packages/gtk2/src/gtk+/gtk/gtkkeyhash.inc
U packages/gtk2/src/gtkext/gtkstatusiconh.inc
U packages/sdl/LGPL
U packages/googleapi/src/googlediscoverytopas.pp
U packages/googleapi/src/googlebase.pp
U packages/hermes/src/hermes_palette.inc
U packages/hermes/src/hermconf.inc
U packages/hermes/src/factconv.inc
U packages/hermes/src/p_32.inc
U packages/hermes/src/p_24.inc
U packages/hermes/src/p_16.inc
U packages/hermes/src/p_cnv.inc
U packages/hermes/src/p_g.inc
U packages/hermes/src/hermes_utility.inc
U packages/hermes/src/p_ga.inc
U packages/hermes/src/p_gca.inc
U packages/hermes/src/p_gac.inc
U packages/hermes/src/p_muhmu.inc
U packages/hermes/src/p_cpy.inc
U packages/hermes/src/hermdef.inc
U packages/hermes/src/hermes_converter.inc
U packages/hermes/src/hermes_factory.inc
U packages/hermes/src/p_gcc.inc
U packages/hermes/src/hermes_list.inc
U packages/hermes/src/hermes_clearer.inc
U packages/hermes/src/headp.inc
U packages/hermes/src/i386/mmxp2_32.inc
U packages/hermes/src/i386/x86_main.inc
U packages/hermes/src/i386/x86p_32.inc
U packages/hermes/src/i386/headi386.inc
U packages/hermes/src/i386/x86p_16.inc
U packages/hermes/src/i386/x86p_s32.inc
U packages/hermes/src/i386/x86p_cpy.inc
U packages/hermes/src/i386/mmx_clr.inc
U packages/hermes/src/i386/x8616lut.inc
U packages/hermes/src/i386/headmmx.inc
U packages/hermes/src/i386/x86pscpy.inc
U packages/hermes/src/i386/mmx_main.inc
U packages/hermes/src/i386/mmxp_32.inc
U packages/hermes/src/i386/x86_clr.inc
U packages/hermes/src/i386/x86p_i8.inc
U packages/hermes/src/hermes_dither.inc
U packages/hermes/src/x86_64/x86_64_i8.inc
U packages/hermes/src/d_32.inc
U packages/hermes/src/hermes_debug.inc
U packages/hermes/src/hermes.pp
U packages/hermes/src/hermes_format.inc
U packages/hermes/src/p_clr.inc
U packages/hermes/src/p_i8.inc
U packages/fcl-db/src/sqlite/customsqliteds.pas
U packages/fcl-db/src/sqlite/sqliteds.pas
U packages/fcl-db/src/sqlite/sqlite3ds.pas
U packages/fcl-db/src/sqldb/sqlite/sqlite3backup.pas
U packages/fcl-db/src/sqldb/postgres/pqeventmonitor.pp
U packages/fcl-db/src/sqldb/interbase/fbeventmonitor.pp
U packages/fcl-db/src/sqldb/interbase/fbadmin.pp
U packages/matroska/src/matroska.pas
U packages/ptc/src/win32/directx/win32directxcheck.inc
U packages/ptc/src/win32/directx/win32directxtranslate.inc
U packages/ptc/src/win32/directx/win32directxhook.inc
U packages/ptc/src/win32/directx/win32directxprimary.inc
U packages/ptc/src/win32/directx/win32directxhookd.inc
U packages/ptc/src/win32/directx/win32directxlibrary.inc
U packages/ptc/src/win32/directx/win32directxdisplay.inc
U packages/ptc/src/win32/directx/win32directxconsoled.inc
U packages/ptc/src/win32/directx/win32directxprimaryd.inc
U packages/ptc/src/win32/directx/win32directxlibraryd.inc
U packages/ptc/src/win32/directx/win32directxdisplayd.inc
U packages/ptc/src/win32/directx/win32directxconsolei.inc
U packages/ptc/src/win32/gdi/win32gdiconsolei.inc
U packages/ptc/src/win32/gdi/win32modesetterd.inc
U packages/ptc/src/win32/gdi/win32openglwindowd.inc
U packages/ptc/src/win32/gdi/win32dibd.inc
U packages/ptc/src/win32/gdi/win32modesetteri.inc
U packages/ptc/src/win32/gdi/win32openglwindowi.inc
U packages/ptc/src/win32/gdi/win32dibi.inc
U packages/ptc/src/win32/gdi/win32gdihookd.inc
U packages/ptc/src/win32/gdi/win32gdiconsoled.inc
U packages/ptc/src/win32/gdi/win32gdihooki.inc
U packages/ptc/src/win32/base/win32hook.inc
U packages/ptc/src/win32/base/win32kbd.inc
U packages/ptc/src/win32/base/win32mousei.inc
U packages/ptc/src/win32/base/win32hookd.inc
U packages/ptc/src/win32/base/win32kbdd.inc
U packages/ptc/src/win32/base/win32resized.inc
U packages/ptc/src/win32/base/win32window.inc
U packages/ptc/src/win32/base/win32resizei.inc
U packages/ptc/src/win32/base/win32windowd.inc
U packages/ptc/src/win32/base/win32cursor.inc
U packages/ptc/src/win32/base/win32event.inc
U packages/ptc/src/win32/base/win32cursord.inc
U packages/ptc/src/win32/base/win32eventd.inc
U packages/ptc/src/win32/base/win32cursormoded.inc
U packages/ptc/src/win32/base/win32monitor.inc
U packages/ptc/src/win32/base/win32monitord.inc
U packages/ptc/src/win32/base/win32moused.inc
U packages/ptc/src/cocoa/cocoaconsolei.inc
U packages/ptc/src/cocoa/cocoaconsoled.inc
U packages/ptc/src/ptc.pp
U packages/ptc/src/dos/textfx2/textfx2consoled.inc
U packages/ptc/src/dos/textfx2/textfx2consolei.inc
U packages/ptc/src/dos/base/mousei.inc
U packages/ptc/src/dos/base/kbdd.inc
U packages/ptc/src/dos/base/mouse33h.pp
U packages/ptc/src/dos/base/moused.inc
U packages/ptc/src/dos/base/kbd.inc
U packages/ptc/src/dos/cga/cga.pp
U packages/ptc/src/dos/cga/cgaconsoled.inc
U packages/ptc/src/dos/cga/cgaconsolei.inc
U packages/ptc/src/dos/vga/vgaconsolei.inc
U packages/ptc/src/dos/vga/vga.pp
U packages/ptc/src/dos/vga/vgaconsoled.inc
U packages/ptc/src/dos/timeunit/timeunit.pp
U packages/ptc/src/dos/vesa/vesaconsolei.inc
U packages/ptc/src/dos/vesa/vesa.pp
U packages/ptc/src/dos/vesa/vesaconsoled.inc
U packages/ptc/src/wince/gapi/wincegapiconsolei.inc
U packages/ptc/src/wince/gapi/wincegapiconsoled.inc
U packages/ptc/src/wince/gdi/wincebitmapinfoi.inc
U packages/ptc/src/wince/gdi/wincegdiconsoled.inc
U packages/ptc/src/wince/gdi/wincebitmapinfod.inc
U packages/ptc/src/wince/gdi/wincegdiconsolei.inc
U packages/ptc/src/wince/base/wincekeyboardi.inc
U packages/ptc/src/wince/base/wincewindowd.inc
U packages/ptc/src/wince/base/wincemoused.inc
U packages/ptc/src/wince/base/wincewindowi.inc
U packages/ptc/src/wince/base/wincemousei.inc
U packages/ptc/src/wince/base/wincekeyboardd.inc
U packages/ptc/src/ptcwrapper/ptcwrapper.pp
U packages/ptc/src/ptcwrapper/ptceventqueue.pp
U packages/ptc/src/core/closeeventd.inc
U packages/ptc/src/core/consolei.inc
U packages/ptc/src/core/resizeeventi.inc
U packages/ptc/src/core/closeeventi.inc
U packages/ptc/src/core/eventd.inc
U packages/ptc/src/core/moded.inc
U packages/ptc/src/core/eventi.inc
U packages/ptc/src/core/modei.inc
U packages/ptc/src/core/openglattributesd.inc
U packages/ptc/src/core/clipperd.inc
U packages/ptc/src/core/openglattributesi.inc
U packages/ptc/src/core/clipperi.inc
U packages/ptc/src/core/aread.inc
U packages/ptc/src/core/copyd.inc
U packages/ptc/src/core/log.inc
U packages/ptc/src/core/areai.inc
U packages/ptc/src/core/colord.inc
U packages/ptc/src/core/copyi.inc
U packages/ptc/src/core/timerd.inc
U packages/ptc/src/core/basesurfaced.inc
U packages/ptc/src/core/colori.inc
U packages/ptc/src/core/timeri.inc
U packages/ptc/src/core/cleard.inc
U packages/ptc/src/core/surfaced.inc
U packages/ptc/src/core/basesurfacei.inc
U packages/ptc/src/core/formatd.inc
U packages/ptc/src/core/errord.inc
U packages/ptc/src/core/mouseeventd.inc
U packages/ptc/src/core/keyeventd.inc
U packages/ptc/src/core/cleari.inc
U packages/ptc/src/core/surfacei.inc
U packages/ptc/src/core/baseconsoled.inc
U packages/ptc/src/core/formati.inc
U packages/ptc/src/core/paletted.inc
U packages/ptc/src/core/errori.inc
U packages/ptc/src/core/keyeventi.inc
U packages/ptc/src/core/mouseeventi.inc
U packages/ptc/src/core/baseconsolei.inc
U packages/ptc/src/core/consoled.inc
U packages/ptc/src/core/palettei.inc
U packages/ptc/src/core/resizeeventd.inc
U packages/ptc/src/x11/x11glxfbconfigd.inc
U packages/ptc/src/x11/x11windowdisplayd.inc
U packages/ptc/src/x11/x11glxfbconfigi.inc
U packages/ptc/src/x11/x11unikey.inc
U packages/ptc/src/x11/x11windowdisplayi.inc
U packages/ptc/src/x11/x11consoled.inc
U packages/ptc/src/x11/x11dga1displayd.inc
U packages/ptc/src/x11/x11dga2displayd.inc
U packages/ptc/src/x11/x11displayd.inc
U packages/ptc/src/x11/x11consolei.inc
U packages/ptc/src/x11/x11dga1displayi.inc
U packages/ptc/src/x11/x11modesd.inc
U packages/ptc/src/x11/x11dga2displayi.inc
U packages/ptc/src/x11/x11check.inc
U packages/ptc/src/x11/x11displayi.inc
U packages/ptc/src/x11/x11modesi.inc
U packages/ptc/src/x11/x11imaged.inc
U packages/ptc/src/x11/x11imagei.inc
U packages/ptc/src/c_api/capi_copyd.inc
U packages/ptc/src/c_api/capi_color.inc
U packages/ptc/src/c_api/capi_timer.inc
U packages/ptc/src/c_api/capi_colord.inc
U packages/ptc/src/c_api/capi_mode.inc
U packages/ptc/src/c_api/capi_timerd.inc
U packages/ptc/src/c_api/capi_clear.inc
U packages/ptc/src/c_api/capi_except.inc
U packages/ptc/src/c_api/capi_format.inc
U packages/ptc/src/c_api/capi_key.inc
U packages/ptc/src/c_api/capi_moded.inc
U packages/ptc/src/c_api/capi_surface.inc
U packages/ptc/src/c_api/capi_error.inc
U packages/ptc/src/c_api/capi_cleard.inc
U packages/ptc/src/c_api/capi_surfaced.inc
U packages/ptc/src/c_api/capi_keyd.inc
U packages/ptc/src/c_api/capi_formatd.inc
U packages/ptc/src/c_api/capi_exceptd.inc
U packages/ptc/src/c_api/capi_errord.inc
U packages/ptc/src/c_api/capi_palette.inc
U packages/ptc/src/c_api/capi_clipper.inc
U packages/ptc/src/c_api/capi_paletted.inc
U packages/ptc/src/c_api/capi_clipperd.inc
U packages/ptc/src/c_api/capi_console.inc
U packages/ptc/src/c_api/capi_consoled.inc
U packages/ptc/src/c_api/capi_index.inc
U packages/ptc/src/c_api/capi_area.inc
U packages/ptc/src/c_api/capi_copy.inc
U packages/ptc/src/c_api/capi_aread.inc
U packages/ptc/docs/lgpl.txt
U packages/fcl-base/src/csvdocument.pp
U packages/fcl-base/src/csvreadwrite.pp
U packages/winunits-base/src/eventsink.pp
U packages/winunits-base/src/typelib.pas
U packages/mysql/src/mysql4_com.pp
U packages/mysql/src/mysql.inc
U packages/mysql/src/mysql4_comdyn.pp
U packages/mysql/src/mysql4dyn.pp
U packages/chm/src/paslzxcomp.pas
U packages/aspell/LICENSE
U packages/os2units/src/dive.pas
U packages/bfd/src/bfd.pas
U utils/instantfpc/instantfpc.pas
U utils/fpdoc/COPYING.txt
U utils/fpdoc/README.txt
U utils/fppkg/lnet/LICENSE.ADDON
U utils/fppkg/lnet/lmimetypes.pp
U utils/fppkg/lnet/lhttputil.pp
U utils/fppkg/lnet/lprocess.pp
U utils/fppkg/lnet/lhttp.pp
U utils/fppkg/lnet/ltimer.pp
U utils/fppkg/lnet/lfastcgi.pp
U utils/fppkg/lnet/lspawnfcgi.pp
U utils/fppkg/lnet/lsmtp.pp
U utils/fppkg/lnet/lnet.pp
U utils/fppkg/lnet/lmimestreams.pp
U utils/fppkg/lnet/lmimewrapper.pp
U utils/fppkg/lnet/lcommon.pp
U utils/fppkg/lnet/LICENSE
U utils/fppkg/lnet/lftp.pp
U utils/fppkg/lnet/ltelnet.pp
U utils/fppkg/lnet/lstrbuffer.pp
U utils/fppkg/lnet/lwebserver.pp
U utils/fppkg/lnet/levents.pp
U utils/fppkg/lnet/lcontrolstack.pp
U rtl/sparc/setjumph.inc
U rtl/win/wininc/struct.inc
U rtl/win/wininc/unifun.inc
U rtl/win/wininc/ascdef.inc
U rtl/win/wininc/messages.inc
U rtl/win/wininc/base.inc
U rtl/win/wininc/unidef.inc
U rtl/win/wininc/func.inc
U rtl/win/wininc/errors.inc
U rtl/win/wininc/defines.inc
U rtl/win/wininc/ascfun.inc
U rtl/linux/powerpc/cprt0.as
U rtl/linux/arm/ucprt0.as
U rtl/linux/powerpc64/cprt0.as
U rtl/linux/powerpc64/gprt0.as
U rtl/linux/mips/cprt0.as
U rtl/os2/moncalls.pas
U rtl/os2/viocalls.pas
U rtl/os2/pmgpi.pas
U rtl/os2/moucalls.pas
U rtl/os2/kbdcalls.pas
U rtl/inc/flt_conv.inc
U rtl/inc/flt_core.inc
U rtl/wince/wininc/struct.inc
U rtl/wince/wininc/messages.inc
U rtl/wince/wininc/base.inc
U rtl/wince/wininc/errors.inc
U rtl/wince/wininc/defines.inc
U rtl/java/jsystem.inc
U rtl/COPYING.txt
U tests/test/units/sysutils/twstrcmp.pp
U tests/test/units/sysutils/tstrcmp.pp
U tests/test/units/sysutils/tastrcmp.pp
U tests/utils/avx/avxtestgenerator.pp
U tests/utils/avx/baselist.pas
U tests/utils/avx/asmtestgenerator.pas
U tests/utils/avx/options.pas
--- Recording mergeinfo for merge of r34598 into '.':
U .
--- Merging r35481 into '.':
U packages/graph/src/inc/gtext.inc
--- Recording mergeinfo for merge of r35481 into '.':
G .
--- Merging r36507 into '.':
G packages/ptc/src/dos/timeunit/timeunit.pp
D packages/ptc/src/dos/base/go32fix.pp
G packages/ptc/src/core/keyeventd.inc
G packages/ptc/src/core/mouseeventd.inc
G packages/ptc/src/core/baseconsoled.inc
G packages/ptc/src/core/errori.inc
G packages/ptc/src/core/baseconsolei.inc
G packages/ptc/src/core/consolei.inc
U packages/ptc/src/ptcpas.cfg
A packages/ptc/src/ptclaz.lpr
G packages/ptc/src/x11/x11consolei.inc
G packages/ptc/src/x11/x11dga1displayi.inc
G packages/ptc/src/x11/x11dga2displayi.inc
G packages/ptc/src/x11/x11displayi.inc
U packages/ptc/src/x11/x11extensions.inc
G packages/ptc/src/x11/x11windowdisplayd.inc
G packages/ptc/src/x11/x11unikey.inc
G packages/ptc/src/x11/x11windowdisplayi.inc
G packages/ptc/src/x11/x11consoled.inc
G packages/ptc/src/x11/x11dga1displayd.inc
G packages/ptc/src/x11/x11dga2displayd.inc
G packages/ptc/src/x11/x11displayd.inc
A packages/ptc/src/ptclaz.lpi
G packages/ptc/src/win32/base/win32moused.inc
G packages/ptc/src/win32/base/win32kbd.inc
G packages/ptc/src/win32/base/win32hook.inc
G packages/ptc/src/win32/base/win32mousei.inc
G packages/ptc/src/win32/base/win32kbdd.inc
G packages/ptc/src/win32/base/win32window.inc
G packages/ptc/src/win32/base/win32windowd.inc
U packages/ptc/src/win32/directx/p_ddraw.pp
G packages/ptc/src/win32/directx/win32directxhook.inc
A packages/ptc/src/win32/directx/p_dinput.pp
G packages/ptc/src/win32/directx/win32directxdisplay.inc
G packages/ptc/src/win32/directx/win32directxconsoled.inc
G packages/ptc/src/win32/directx/win32directxconsolei.inc
G packages/ptc/src/win32/gdi/win32gdiconsoled.inc
G packages/ptc/src/win32/gdi/win32gdiconsolei.inc
G packages/ptc/src/win32/gdi/win32openglwindowd.inc
G packages/ptc/src/win32/gdi/win32openglwindowi.inc
G packages/ptc/src/ptc.pp
U packages/ptc/docs/INSTALL.txt
U packages/ptc/docs/CHANGES.txt
U packages/ptc/docs/README.txt
U packages/ptc/examples/keyboard3.pp
U packages/ptc/fpmake.pp
A packages/ptc/tests/event.pp
U packages/graph/src/ptcgraph/ptcgraph.pp
--- Recording mergeinfo for merge of r36507 into '.':
G .
--- Merging r36508 into '.':
G packages/ptc/fpmake.pp
--- Recording mergeinfo for merge of r36508 into '.':
G .
--- Merging r36509 into '.':
U packages/ptc/src/dos/textfx2/textfx2.pp
G packages/ptc/src/dos/base/mouse33h.pp
G packages/ptc/src/dos/cga/cga.pp
G packages/ptc/src/dos/vga/vga.pp
G packages/ptc/src/dos/vesa/vesa.pp
--- Recording mergeinfo for merge of r36509 into '.':
G .
--- Merging r36555 into '.':
U packages/graph/src/ptcgraph/ptccrt.pp
G packages/ptc/src/core/keyeventd.inc
G packages/ptc/src/x11/x11displayi.inc
G packages/ptc/src/win32/base/win32kbd.inc
G packages/ptc/docs/CHANGES.txt
A packages/ptc/tests/crtkeys
A packages/ptc/tests/crtkeys/crtkeys_go32v2.txt
A packages/ptc/tests/crtkeys/crtkeys.pas
A packages/ptc/tests/crtkeys/crtkeys_tp7.txt
A packages/ptc/tests/crtkeys/ptccrtkeys.pas
A packages/ptc/tests/crtkeys/crtkeys_fpwincrt.txt
--- Recording mergeinfo for merge of r36555 into '.':
G .
--- Merging r36556 into '.':
G packages/graph/src/ptcgraph/ptccrt.pp
G packages/ptc/src/win32/base/win32kbd.inc
--- Recording mergeinfo for merge of r36556 into '.':
G .
# revisions: 34598,35481,36507,36508,36509,36555,36556
git-svn-id: branches/fixes_3_0@36558 -
U packages/fcl-db/src/sqldb/sqldb.pp
--- Recording mergeinfo for merge of r35421 into '.':
U .
# revisions: 35421
git-svn-id: branches/fixes_3_0@36415 -
U packages/fcl-db/src/base/database.inc
--- Recording mergeinfo for merge of r36383 into '.':
U .
# revisions: 36383
git-svn-id: branches/fixes_3_0@36384 -
U packages/fcl-db/src/base/dsparams.inc
--- Recording mergeinfo for merge of r34244 into '.':
U .
--- Merging r34556 into '.':
U packages/dblib/src/dblib.pp
--- Recording mergeinfo for merge of r34556 into '.':
G .
--- Merging r34745 into '.':
U packages/fcl-db/tests/testspecifictbufdataset.pas
U packages/fcl-db/src/base/dataset.inc
--- Recording mergeinfo for merge of r34745 into '.':
G .
--- Merging r35465 into '.':
U packages/fcl-db/fpmake.pp
--- Recording mergeinfo for merge of r35465 into '.':
G .
--- Merging r35618 into '.':
U packages/fcl-db/src/base/bufdataset.pas
--- Recording mergeinfo for merge of r35618 into '.':
G .
--- Merging r35628 into '.':
G packages/fcl-db/src/base/dataset.inc
--- Recording mergeinfo for merge of r35628 into '.':
G .
--- Merging r35629 into '.':
U packages/fcl-db/tests/testdbbasics.pas
--- Recording mergeinfo for merge of r35629 into '.':
G .
--- Merging r35630 into '.':
U packages/fcl-db/src/Dataset.txt
--- Recording mergeinfo for merge of r35630 into '.':
G .
--- Merging r35690 into '.':
U packages/fcl-db/src/sqldb/sqldb.pp
--- Recording mergeinfo for merge of r35690 into '.':
G .
# revisions: 34244,34556,34745,35465,35618,35628,35629,35630,35690
git-svn-id: branches/fixes_3_0@35994 -
U packages/fcl-db/src/sqldb/sqldb.pp
U packages/fcl-db/src/sqldb/mysql/mysqlconn.inc
--- Recording mergeinfo for merge of r33254 into '.':
U .
--- Merging r33420 into '.':
U packages/fcl-db/tests/testdbbasics.pas
U packages/fcl-db/src/base/bufdataset.pas
--- Recording mergeinfo for merge of r33420 into '.':
G .
--- Merging r33421 into '.':
G packages/fcl-db/src/base/bufdataset.pas
--- Recording mergeinfo for merge of r33421 into '.':
G .
--- Merging r33422 into '.':
G packages/fcl-db/src/base/bufdataset.pas
--- Recording mergeinfo for merge of r33422 into '.':
G .
--- Merging r33427 into '.':
G packages/fcl-db/src/base/bufdataset.pas
--- Recording mergeinfo for merge of r33427 into '.':
G .
--- Merging r33570 into '.':
G packages/fcl-db/src/sqldb/sqldb.pp
--- Recording mergeinfo for merge of r33570 into '.':
G .
--- Merging r33666 into '.':
U packages/fcl-db/tests/toolsunit.pas
U packages/fcl-db/tests/sqldbtoolsunit.pas
--- Recording mergeinfo for merge of r33666 into '.':
G .
--- Merging r33905 into '.':
U packages/fcl-db/src/sqldb/interbase/fbadmin.pp
--- Recording mergeinfo for merge of r33905 into '.':
G .
--- Merging r33911 into '.':
G packages/fcl-db/src/sqldb/interbase/fbadmin.pp
--- Recording mergeinfo for merge of r33911 into '.':
G .
--- Merging r33912 into '.':
G packages/fcl-db/src/sqldb/interbase/fbadmin.pp
--- Recording mergeinfo for merge of r33912 into '.':
G .
--- Merging r33913 into '.':
U packages/fcl-db/src/sqldb/interbase/fbadmin.pp
--- Recording mergeinfo for merge of r33913 into '.':
G .
--- Merging r34095 into '.':
U packages/postgres/src/postgres3dyn.pp
--- Recording mergeinfo for merge of r34095 into '.':
G .
# revisions: 33254,33420,33421,33422,33427,33570,33666,33905,33911,33912,33913,34095
git-svn-id: branches/fixes_3_0@35993 -
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/cdrom/src/fpcddb.pp
U packages/fcl-net/src/httpsvlt.pp
U packages/fcl-sdo/src/base/sdo_consts.pas
U packages/fcl-sdo/src/base/sdo_xpath_helper.pas
U packages/fv/src/editors.pas
U packages/fv/src/strtxt.inc
U packages/fcl-db/src/base/dbconst.pas
U packages/fcl-db/src/sqlite/sqliteds.pas
U packages/fcl-xml/tests/testgen.pp
U packages/fcl-xml/src/xmltextreader.pp
U utils/fpdoc/fpclasschart.pp
U utils/fpdoc/makeskel.pp
U utils/fpdoc/unitdiff.pp
U utils/fpdoc/dwriter.pp
U utils/fpdoc/dglobals.pp
U utils/delp.pp
U ide/fphelp.pas
U ide/fp.pas
U ide/wconstse.inc
U rtl/objpas/sysconst.pp
U rtl/macos/system.pp
--- Recording mergeinfo for merge of r33882 into '.':
U .
# revisions: 33882
git-svn-id: branches/fixes_3_0@33883 -
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 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 -
U packages/fcl-db/src/sqldb/interbase/fbadmin.pp
--- Recording mergeinfo for merge of r32812 into '.':
U .
--- Merging r32938 into '.':
U packages/fcl-db/src/sqldb/interbase/ibconnection.pp
--- Recording mergeinfo for merge of r32938 into '.':
G .
--- Merging r32941 into '.':
G packages/fcl-db/src/sqldb/interbase/ibconnection.pp
--- Recording mergeinfo for merge of r32941 into '.':
G .
--- Merging r33127 into '.':
U packages/fcl-db/src/sqldb/sqldb.pp
--- Recording mergeinfo for merge of r33127 into '.':
G .
--- Merging r33150 into '.':
U packages/fcl-db/src/base/bufdataset.pas
U packages/fcl-db/tests/testspecifictbufdataset.pas
--- Recording mergeinfo for merge of r33150 into '.':
G .
--- Merging r33169 into '.':
G packages/fcl-db/src/sqldb/sqldb.pp
A packages/fcl-db/src/base/sqltypes.pp
U packages/fcl-db/src/datadict/fpddsqldb.pp
U packages/fcl-db/src/datadict/fpdatadict.pp
U packages/fcl-db/fpmake.pp
--- Recording mergeinfo for merge of r33169 into '.':
G .
--- Merging r33172 into '.':
G packages/fcl-db/src/base/bufdataset.pas
--- Recording mergeinfo for merge of r33172 into '.':
G .
--- Merging r33174 into '.':
G packages/fcl-db/src/sqldb/sqldb.pp
--- Recording mergeinfo for merge of r33174 into '.':
G .
# revisions: 32812,32938,32941,33127,33150,33169,33172,33174
git-svn-id: branches/fixes_3_0@33374 -
U packages/fcl-db/src/sqldb/mysql/mysqlconn.inc
--- Recording mergeinfo for merge of r32931 into '.':
U .
--- Merging r32964 into '.':
U packages/fcl-db/src/datadict/fpdatadict.pp
--- Recording mergeinfo for merge of r32964 into '.':
G .
--- Merging r33049 into '.':
U packages/fcl-db/src/base/dsparams.inc
--- Recording mergeinfo for merge of r33049 into '.':
G .
--- Merging r33078 into '.':
U packages/fcl-db/src/sqldb/sqldb.pp
--- Recording mergeinfo for merge of r33078 into '.':
G .
--- Merging r33079 into '.':
G packages/fcl-db/src/sqldb/sqldb.pp
--- Recording mergeinfo for merge of r33079 into '.':
G .
--- Merging r33080 into '.':
U packages/fcl-db/tests/sqldbtoolsunit.pas
--- Recording mergeinfo for merge of r33080 into '.':
G .
--- Merging r33085 into '.':
U packages/fcl-db/src/base/dataset.inc
U packages/fcl-db/src/dbase/dbf.pas
--- Recording mergeinfo for merge of r33085 into '.':
G .
--- Merging r33086 into '.':
U packages/fcl-db/src/dbase/dbf_common.inc
--- Recording mergeinfo for merge of r33086 into '.':
G .
--- Merging r33087 into '.':
U packages/fcl-db/src/datadict/fpddsqldb.pp
--- Recording mergeinfo for merge of r33087 into '.':
G .
# revisions: 32931,32964,33049,33078,33079,33080,33085,33086,33087
git-svn-id: branches/fixes_3_0@33372 -
U packages/fcl-db/fpmake.pp
U packages/fcl-db/src/datadict/fpddregstd.pp
A packages/fcl-db/src/datadict/fpddmssql.pp
U packages/fcl-db/src/datadict/buildd.lpi
--- Recording mergeinfo for merge of r32831 into '.':
U .
--- Merging r32843 into '.':
G packages/fcl-db/fpmake.pp
--- Recording mergeinfo for merge of r32843 into '.':
G .
--- Merging r32851 into '.':
U packages/fcl-db/src/datadict/fpddsqldb.pp
U packages/fcl-db/src/datadict/fpddmssql.pp
--- Recording mergeinfo for merge of r32851 into '.':
G .
--- Merging r32853 into '.':
U packages/fcl-db/src/base/bufdataset.pas
--- Recording mergeinfo for merge of r32853 into '.':
G .
--- Merging r32854 into '.':
U packages/fcl-db/tests/testdbbasics.pas
--- Recording mergeinfo for merge of r32854 into '.':
G .
# revisions: 32831,32843,32851,32853,32854,3293
git-svn-id: branches/fixes_3_0@33370 -
U packages/fcl-db/src/sqlite/customsqliteds.pas
--- Recording mergeinfo for merge of r32093 into '.':
U .
--- Merging r32131 into '.':
U packages/fcl-db/tests/testdbbasics.pas
U packages/fcl-db/src/base/bufdataset.pas
U packages/fcl-db/src/sdf/sdfdata.pp
U packages/fcl-db/src/memds/memds.pp
--- Recording mergeinfo for merge of r32131 into '.':
G .
--- Merging r32359 into '.':
U packages/fcl-db/src/sqldb/sqldb.pp
--- Recording mergeinfo for merge of r32359 into '.':
G .
--- Merging r32558 into '.':
U packages/fcl-db/src/base/bufdataset_parser.pp
--- Recording mergeinfo for merge of r32558 into '.':
G .
--- Merging r32566 into '.':
G packages/fcl-db/src/sqldb/sqldb.pp
--- Recording mergeinfo for merge of r32566 into '.':
G .
--- Merging r32729 into '.':
U packages/fcl-db/src/sqldb/postgres/pqconnection.pp
--- Recording mergeinfo for merge of r32729 into '.':
G .
--- Merging r32753 into '.':
U packages/fcl-db/src/sqlite/sqliteds.pas
U packages/fcl-db/src/sqlite/sqlite3ds.pas
--- Recording mergeinfo for merge of r32753 into '.':
G .
--- Merging r32754 into '.':
G packages/fcl-db/src/sqlite/sqlite3ds.pas
--- Recording mergeinfo for merge of r32754 into '.':
G .
--- Merging r32755 into '.':
G packages/fcl-db/src/sqlite/sqliteds.pas
--- Recording mergeinfo for merge of r32755 into '.':
G .
--- Merging r32796 into '.':
U packages/fcl-db/src/base/dataset.inc
--- Recording mergeinfo for merge of r32796 into '.':
G .
--- Merging r32800 into '.':
U packages/fcl-db/src/base/sqlscript.pp
--- Recording mergeinfo for merge of r32800 into '.':
G .
--- Merging r32801 into '.':
U packages/fcl-db/tests/dbtestframework.pas
U packages/fcl-db/tests/testsqlscript.pas
--- Recording mergeinfo for merge of r32801 into '.':
G .
--- Merging r32807 into '.':
G packages/fcl-db/src/base/bufdataset.pas
--- Recording mergeinfo for merge of r32807 into '.':
G .
--- Merging r32808 into '.':
U packages/fcl-db/src/sqldb/mysql/mysqlconn.inc
--- Recording mergeinfo for merge of r32808 into '.':
G .
--- Merging r32810 into '.':
G packages/fcl-db/src/sqldb/sqldb.pp
--- Recording mergeinfo for merge of r32810 into '.':
G .
# revisions: 32093,32131,32359,32558,32566,32729,32753,32754,32755,32796,32800,32801,32807,32808,32810
git-svn-id: branches/fixes_3_0@33368 -
U packages/fcl-db/src/sqlite/customsqliteds.pas
U packages/fcl-db/src/sqlite/sqlite3ds.pas
--- Recording mergeinfo for merge of r31837 into '.':
U .
--- Merging r31838 into '.':
G packages/fcl-db/src/sqlite/customsqliteds.pas
--- Recording mergeinfo for merge of r31838 into '.':
G .
--- Merging r31839 into '.':
G packages/fcl-db/src/sqlite/customsqliteds.pas
--- Recording mergeinfo for merge of r31839 into '.':
G .
--- Merging r31840 into '.':
U packages/fcl-db/src/sqlite/sqliteds.pas
--- Recording mergeinfo for merge of r31840 into '.':
G .
--- Merging r31841 into '.':
U packages/fcl-db/src/sqlite/fillds.pas
U packages/fcl-db/src/sqlite/concurrencyds.pas
U packages/fcl-db/src/sqlite/testds.pas
U packages/fcl-db/src/sqlite/browseds.pas
U packages/fcl-db/src/sqlite/createds.pas
--- Recording mergeinfo for merge of r31841 into '.':
G .
--- Merging r31844 into '.':
G packages/fcl-db/src/sqlite/customsqliteds.pas
--- Recording mergeinfo for merge of r31844 into '.':
G .
--- Merging r31845 into '.':
G packages/fcl-db/src/sqlite/fillds.pas
--- Recording mergeinfo for merge of r31845 into '.':
G .
--- Merging r31853 into '.':
G packages/fcl-db/src/sqlite/customsqliteds.pas
G packages/fcl-db/src/sqlite/sqlite3ds.pas
--- Recording mergeinfo for merge of r31853 into '.':
G .
--- Merging r31876 into '.':
G packages/fcl-db/src/sqlite/customsqliteds.pas
--- Recording mergeinfo for merge of r31876 into '.':
G .
--- Merging r31877 into '.':
G packages/fcl-db/src/sqlite/customsqliteds.pas
--- Recording mergeinfo for merge of r31877 into '.':
G .
--- Merging r32034 into '.':
U packages/fcl-db/src/sqldb/sqlite/sqlite3conn.pp
--- Recording mergeinfo for merge of r32034 into '.':
G .
# revisions: 31837,31838,31839,31840,31841,31844,31845,31853,31876,31877,32034
git-svn-id: branches/fixes_3_0@33367 -
U packages/fcl-db/src/datadict/fpdatadict.pp
--- Recording mergeinfo for merge of r32850 into '.':
U .
--- Merging r32963 into '.':
G packages/fcl-db/src/datadict/fpdatadict.pp
--- Recording mergeinfo for merge of r32963 into '.':
G .
# revisions: 32850,32963
git-svn-id: branches/fixes_3_0@33357 -
U packages/rtl-objpas/fpmake.pp
--- Recording mergeinfo for merge of r32074 into '.':
U .
--- Merging r32119 into '.':
U packages/aspell/fpmake.pp
--- Recording mergeinfo for merge of r32119 into '.':
G .
--- Merging r32120 into '.':
U packages/rtl-extra/fpmake.pp
--- Recording mergeinfo for merge of r32120 into '.':
G .
--- Merging r32121 into '.':
U packages/chm/fpmake.pp
--- Recording mergeinfo for merge of r32121 into '.':
G .
--- Merging r32123 into '.':
U packages/fcl-db/fpmake.pp
--- Recording mergeinfo for merge of r32123 into '.':
G .
# revisions: 32074,32119,32120,32121,32123
git-svn-id: branches/fixes_3_0@32239 -
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 -
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/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/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 -
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 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 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 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-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 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/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 packages/fcl-db/src/sqldb/mssql/mssqlconn.pp
--- Merging r29442 into '.':
U packages/fcl-db/src/base/bufdataset.pas
U packages/fcl-db/src/sqldb/sqldb.pp
--- Merging r29443 into '.':
G packages/fcl-db/src/sqldb/mssql/mssqlconn.pp
G packages/fcl-db/src/sqldb/sqldb.pp
G packages/fcl-db/src/base/bufdataset.pas
U packages/fcl-db/src/base/db.pas
U packages/fcl-db/tests/testsqldb.pas
--- Merging r29448 into '.':
U packages/fcl-db/src/sqldb/sqlite/sqlite3conn.pp
U packages/fcl-db/src/sqldb/mysql/mysqlconn.inc
--- Merging r29451 into '.':
G packages/fcl-db/tests/testsqldb.pas
--- Merging r29462 into '.':
G packages/fcl-db/tests/testsqldb.pas
--- Merging r29479 into '.':
U packages/fcl-db/src/sqldb/postgres/pqconnection.pp
--- Merging r29480 into '.':
G packages/fcl-db/tests/testsqldb.pas
--- Merging r29507 into '.':
G packages/fcl-db/src/sqldb/postgres/pqconnection.pp
--- Merging r29624 into '.':
G packages/fcl-db/src/base/db.pas
U packages/fcl-db/src/base/fields.inc
--- Merging r29638 into '.':
U packages/rtl-unicode/fpmake.pp
U packages/rtl-unicode/src/inc/cpbuildu.pp
A packages/rtl-unicode/src/inc/cp895.pas
A rtl/ucmaps/cp895.txt
--- Merging r29662 into '.':
U packages/fcl-db/src/sqldb/mssql/readme.txt
--- Merging r29679 into '.':
U packages/fcl-db/src/base/dsparams.inc
U packages/fcl-db/src/base/datasource.inc
G packages/fcl-db/tests/testsqldb.pas
# revisions: 29430,29442,29443,29448,29451,29462,29479,29480,29507,29624,29638,29662,29679
git-svn-id: branches/fixes_3_0@29682 -
U packages/rtl-unicode/fpmake.pp
--- Merging r29568 into '.':
U utils/unicode/fpmake.pp
--- Merging r29571 into '.':
U rtl/os2/sysucode.inc
--- Merging r29572 into '.':
U rtl/os2/system.pas
U rtl/os2/sysos.inc
G rtl/os2/sysucode.inc
--- Merging r29573 into '.':
U compiler/systems/t_os2.pas
--- Merging r29618 into '.':
G utils/unicode/fpmake.pp
--- Merging r29620 into '.':
U installer/install.dat
--- Merging r29623 into '.':
U rtl/objpas/fpwidestring.pp
--- Merging r29625 into '.':
G rtl/os2/sysucode.inc
--- Merging r29629 into '.':
G rtl/os2/sysucode.inc
--- Merging r29630 into '.':
U packages/fcl-db/src/dbase/dbf_wos2.inc
--- Merging r29631 into '.':
G packages/fcl-db/src/dbase/dbf_wos2.inc
--- Merging r29632 into '.':
U packages/fcl-db/src/dbase/dbf_common.inc
U packages/fcl-db/src/dbase/dbf_common.pas
# revisions: 29567,29568,29571,29572,29573,29618,29620,29623,29625,29629,29630,29631,29632
git-svn-id: branches/fixes_3_0@29634 -
U rtl/unix/dl.pp
U rtl/android/Makefile.fpc
A rtl/android/dlandroid.inc
U rtl/android/Makefile
--- Merging r29402 into '.':
U utils/fpcm/revision.inc
--- Merging r29418 into '.':
U rtl/android/dlandroid.inc
--- Merging r29419 into '.':
U utils/pas2jni/readme.txt
U utils/pas2jni/writer.pas
U utils/pas2jni/ppuparser.pas
--- Merging r29420 into '.':
U packages/fcl-db/src/sqldb/odbc/odbcconn.pas
# revisions: 29401,29402,29418,29419,29420
git-svn-id: branches/fixes_3_0@29421 -
U packages/zorba/Makefile
U packages/zorba/Makefile.fpc
U packages/rtl-extra/Makefile.fpc
U packages/rtl-extra/Makefile
U packages/opengl/Makefile
U packages/opengl/Makefile.fpc
U packages/fcl-extra/Makefile
U packages/fcl-extra/Makefile.fpc
U packages/os2units/Makefile
U packages/os2units/Makefile.fpc
U packages/gnome1/Makefile.fpc
U packages/gnome1/Makefile
U packages/imlib/Makefile
U packages/imlib/Makefile.fpc
U packages/sqlite/Makefile.fpc
U packages/sqlite/Makefile
U packages/graph/Makefile
U packages/graph/Makefile.fpc
U packages/unzip/Makefile.fpc
U packages/unzip/Makefile
U packages/uuid/Makefile
U packages/uuid/Makefile.fpc
U packages/fftw/Makefile
U packages/fftw/Makefile.fpc
U packages/librsvg/Makefile
U packages/librsvg/Makefile.fpc
U packages/libvlc/Makefile.fpc
U packages/libvlc/Makefile
U packages/rtl-objpas/Makefile
U packages/rtl-objpas/Makefile.fpc
U packages/nvapi/Makefile.fpc
U packages/nvapi/Makefile
U packages/sndfile/Makefile.fpc
U packages/sndfile/Makefile
U packages/svgalib/Makefile
U packages/svgalib/Makefile.fpc
U packages/bfd/Makefile.fpc
U packages/bfd/Makefile
U packages/proj4/Makefile.fpc
U packages/proj4/Makefile
U packages/iosxlocale/Makefile
U packages/iosxlocale/Makefile.fpc
U packages/paszlib/Makefile.fpc
U packages/paszlib/Makefile
U packages/libgbafpc/Makefile
U packages/libgbafpc/Makefile.fpc
U packages/fcl-registry/Makefile
U packages/fcl-registry/Makefile.fpc
U packages/regexpr/Makefile
U packages/regexpr/Makefile.fpc
U packages/libtar/Makefile.fpc
U packages/libtar/Makefile
U packages/newt/Makefile
U packages/newt/Makefile.fpc
U packages/xforms/Makefile.fpc
U packages/xforms/Makefile
U packages/openal/Makefile
U packages/openal/Makefile.fpc
U packages/aspell/Makefile
U packages/aspell/Makefile.fpc
U packages/jni/Makefile.fpc
U packages/jni/Makefile
U packages/libgd/Makefile
U packages/libgd/Makefile.fpc
U packages/symbolic/Makefile.fpc
U packages/symbolic/Makefile
U packages/ncurses/Makefile
U packages/ncurses/Makefile.fpc
U packages/sdl/Makefile
U packages/sdl/Makefile.fpc
U packages/arosunits/Makefile.fpc
U packages/arosunits/Makefile
U packages/fcl-net/Makefile
U packages/fcl-net/Makefile.fpc
U packages/fcl-res/Makefile
U packages/fcl-res/Makefile.fpc
U packages/mad/Makefile
U packages/mad/Makefile.fpc
U packages/oracle/Makefile
U packages/oracle/Makefile.fpc
U packages/dblib/Makefile
U packages/dblib/Makefile.fpc
U packages/palmunits/Makefile.fpc
U packages/palmunits/Makefile
U packages/fcl-js/Makefile.fpc
U packages/fcl-js/Makefile
U packages/ldap/Makefile
U packages/ldap/Makefile.fpc
U packages/matroska/Makefile
U packages/matroska/Makefile.fpc
U packages/tcl/Makefile.fpc
U packages/tcl/Makefile
U packages/ibase/Makefile
U packages/ibase/Makefile.fpc
U packages/hash/Makefile
U packages/hash/Makefile.fpc
U packages/gmp/Makefile.fpc
U packages/gmp/Makefile
U packages/openssl/Makefile
U packages/openssl/Makefile.fpc
U packages/utmp/Makefile.fpc
U packages/utmp/Makefile
C packages/bzip2/Makefile
U packages/bzip2/Makefile.fpc
U packages/httpd13/Makefile
U packages/httpd13/Makefile.fpc
U packages/a52/Makefile.fpc
U packages/a52/Makefile
U packages/fcl-sdo/Makefile.fpc
U packages/fcl-sdo/Makefile
U packages/winunits-base/Makefile
U packages/winunits-base/Makefile.fpc
U packages/fcl-sound/Makefile.fpc
U packages/fcl-sound/Makefile
U packages/libcurl/Makefile
U packages/libcurl/Makefile.fpc
U packages/dbus/Makefile
U packages/dbus/Makefile.fpc
U packages/libsee/Makefile
U packages/libsee/Makefile.fpc
U packages/fcl-stl/Makefile.fpc
U packages/fcl-stl/Makefile
U packages/libndsfpc/Makefile.fpc
U packages/libndsfpc/Makefile
U packages/mysql/Makefile.fpc
U packages/mysql/Makefile
U packages/gdbint/Makefile
U packages/gdbint/Makefile.fpc
U packages/fcl-base/Makefile.fpc
U packages/fcl-base/Makefile
U packages/opengles/Makefile.fpc
U packages/opengles/Makefile
U packages/fcl-web/Makefile
U packages/fcl-web/Makefile.fpc
U packages/opencl/Makefile
U packages/opencl/Makefile.fpc
U packages/hermes/Makefile
U packages/hermes/Makefile.fpc
U packages/httpd20/Makefile.fpc
U packages/httpd20/Makefile
U packages/ptc/Makefile
U packages/ptc/Makefile.fpc
U packages/httpd22/Makefile.fpc
U packages/httpd22/Makefile
U packages/ami-extra/Makefile
U packages/ami-extra/Makefile.fpc
U packages/fcl-db/Makefile
U packages/fcl-db/Makefile.fpc
U packages/libogcfpc/Makefile
U packages/libogcfpc/Makefile.fpc
U packages/winunits-jedi/Makefile.fpc
U packages/winunits-jedi/Makefile
U packages/httpd24/Makefile.fpc
U packages/httpd24/Makefile
U packages/dts/Makefile.fpc
U packages/dts/Makefile
U packages/univint/Makefile
U packages/univint/Makefile.fpc
U packages/cocoaint/Makefile
U packages/cocoaint/Makefile.fpc
U packages/rtl-console/Makefile
U packages/rtl-console/Makefile.fpc
U packages/gtk1/Makefile.fpc
U packages/gtk1/Makefile
U packages/ggi/Makefile.fpc
U packages/ggi/Makefile
U packages/gtk2/Makefile
U packages/gtk2/Makefile.fpc
U packages/odbc/Makefile
U packages/odbc/Makefile.fpc
U packages/morphunits/Makefile
U packages/morphunits/Makefile.fpc
U packages/gdbm/Makefile
U packages/gdbm/Makefile.fpc
U packages/pthreads/Makefile
U packages/pthreads/Makefile.fpc
U packages/fcl-json/Makefile
U packages/fcl-json/Makefile.fpc
U packages/amunits/Makefile.fpc
U packages/amunits/Makefile
U packages/unixutil/Makefile
U packages/unixutil/Makefile.fpc
U packages/lua/Makefile.fpc
U packages/lua/Makefile
U packages/pcap/Makefile.fpc
U packages/pcap/Makefile
U packages/fcl-image/Makefile.fpc
U packages/fcl-image/Makefile
U packages/numlib/Makefile
U packages/numlib/Makefile.fpc
U packages/winceunits/Makefile.fpc
U packages/winceunits/Makefile
U packages/pasjpeg/Makefile
U packages/pasjpeg/Makefile.fpc
U packages/zlib/Makefile.fpc
U packages/zlib/Makefile
U packages/fuse/Makefile
U packages/fuse/Makefile.fpc
U packages/iconvenc/Makefile
U packages/iconvenc/Makefile.fpc
U packages/chm/Makefile.fpc
U packages/chm/Makefile
U packages/libc/Makefile
U packages/libc/Makefile.fpc
U packages/x11/Makefile
U packages/x11/Makefile.fpc
U packages/pxlib/Makefile
U packages/pxlib/Makefile.fpc
U packages/fpindexer/Makefile
U packages/fpindexer/Makefile.fpc
U packages/libxml/Makefile.fpc
U packages/libxml/Makefile
U packages/imagemagick/Makefile
U packages/imagemagick/Makefile.fpc
U packages/objcrtl/Makefile
U packages/objcrtl/Makefile.fpc
U packages/oggvorbis/Makefile.fpc
U packages/oggvorbis/Makefile
U packages/users/Makefile.fpc
U packages/users/Makefile
U packages/fcl-xml/Makefile
U packages/fcl-xml/Makefile.fpc
U packages/fcl-fpcunit/Makefile.fpc
U packages/fcl-fpcunit/Makefile
U packages/fpgtk/Makefile.fpc
U packages/fpgtk/Makefile
U packages/libpng/Makefile
U packages/libpng/Makefile.fpc
U packages/fcl-async/Makefile
U packages/fcl-async/Makefile.fpc
U packages/fastcgi/Makefile.fpc
U packages/fastcgi/Makefile
U packages/fcl-process/Makefile
U packages/fcl-process/Makefile.fpc
U packages/syslog/Makefile.fpc
U packages/syslog/Makefile
C packages/pastojs/Makefile
U packages/pastojs/Makefile.fpc
U packages/rtl-unicode/Makefile
U packages/rtl-unicode/Makefile.fpc
U packages/rexx/Makefile.fpc
U packages/rexx/Makefile
U packages/fcl-passrc/Makefile.fpc
U packages/fcl-passrc/Makefile
U packages/cairo/Makefile
U packages/cairo/Makefile.fpc
U packages/cdrom/Makefile
U packages/cdrom/Makefile.fpc
U packages/postgres/Makefile
U packages/postgres/Makefile.fpc
U packages/modplug/Makefile.fpc
U packages/modplug/Makefile
U packages/fppkg/Makefile.fpc
U packages/fppkg/Makefile
U packages/fv/Makefile.fpc
U packages/fv/Makefile
Summary of conflicts:
Text conflicts: 2
# revisions: 29409
git-svn-id: branches/fixes_3_0@29414 -
