U utils/fpcmkcfg/fpcmkcfg.pp
U utils/fpcmkcfg/fpccfg.inc
U utils/fpcmkcfg/fpc.cft
G .
--- Recording mergeinfo for merge of r39845 into '.':
G .
git-svn-id: tags/release_3_0_4a_macos_10_14@39847 -
U packages/winunits-jedi/src/jwawincrypt.pas
--- Recording mergeinfo for merge of r37146 into '.':
U .
# revisions: 37146
git-svn-id: branches/fixes_3_0@37148 -
U rtl/objpas/sysutils/filutil.inc
U rtl/objpas/sysutils/filutilh.inc
U rtl/unix/sysutils.pp
U rtl/win/sysutils.pp
G .
--- Recording mergeinfo for merge of r37138 into '.':
G .
git-svn-id: tags/release_3_0_4@37139 -
C utils/fpcm/revision.inc
C rtl/objpas/sysutils/filutil.inc
U rtl/objpas/sysutils/filutilh.inc
U rtl/win/sysutils.pp
U rtl/unix/sysutils.pp
--- Recording mergeinfo for merge of r37135 into '.':
U .
Summary of conflicts:
Text conflicts: 2
# revisions: 37135
git-svn-id: branches/fixes_3_0@37138 -
U rtl/win/wininc/ascfun.inc
U rtl/win/wininc/struct.inc
U rtl/win/wininc/unifun.inc
U rtl/win/wininc/func.inc
U rtl/win/wininc/defines.inc
G .
--- Recording mergeinfo for merge of r37130 into '.':
G .
git-svn-id: tags/release_3_0_4@37131 -
U rtl/win/wininc/struct.inc
U rtl/win/wininc/unifun.inc
U rtl/win/wininc/func.inc
U rtl/win/wininc/defines.inc
U rtl/win/wininc/ascfun.inc
--- Recording mergeinfo for merge of r36742 into '.':
U .
# revisions: 36742
git-svn-id: branches/fixes_3_0@37130 -
U rtl/win/wininc/base.inc
U rtl/win/wininc/defines.inc
G .
--- Recording mergeinfo for merge of r37128 into '.':
G .
git-svn-id: tags/release_3_0_4@37129 -
U rtl/win/wininc/base.inc
U rtl/win/wininc/defines.inc
--- Recording mergeinfo for merge of r36766 into '.':
U .
# revisions: 36766
git-svn-id: branches/fixes_3_0@37128 -
U packages/fcl-image/src/fpimage.pp
--- Recording mergeinfo for merge of r36774 into '.':
U .
# revisions: 36774
git-svn-id: branches/fixes_3_0@37126 -
U Makefile
U Makefile.fpc
U compiler/Makefile
U compiler/Makefile.fpc
U .
--- Recording mergeinfo for merge of r37118 into '.':
G .
--- Merging r37119 into '.':
G compiler/Makefile.fpc
G compiler/Makefile
G .
--- Recording mergeinfo for merge of r37119 into '.':
G .
--- Merging r37120 into '.':
A rtl/gba/rtl.cfg
--- Recording mergeinfo for merge of r37120 into '.':
G .
git-svn-id: tags/release_3_0_4@37121 -
U packages/rtl-console/src/win/winevent.pp
--- Recording mergeinfo for merge of r36663 into '.':
U .
# revisions: 36663
git-svn-id: branches/fixes_3_0@37101 -
U packages/gtk2/src/gtk+/gtk/gtkicontheme.inc
--- Recording mergeinfo for merge of r36294 into '.':
U .
# revisions: 36294
git-svn-id: branches/fixes_3_0@37099 -
U packages/iconvenc/src/iconvenc_dyn.pas
U packages/iconvenc/src/iconvert.inc
U packages/iconvenc/src/iconvenc.pas
--- Recording mergeinfo for merge of r36139 into '.':
U .
# revisions: 36139
git-svn-id: branches/fixes_3_0@37098 -
U packages/chm/src/chmfilewriter.pas
--- Recording mergeinfo for merge of r36747 into '.':
U .
# revisions: 36747
git-svn-id: branches/fixes_3_0@36748 -
U packages/chm/src/chmfilewriter.pas
--- Recording mergeinfo for merge of r36729 into '.':
U .
# revisions: 36729
git-svn-id: branches/fixes_3_0@36732 -
U packages/fcl-base/src/inifiles.pp
--- Recording mergeinfo for merge of r36585 into '.':
U .
# revisions: 36585
git-svn-id: branches/fixes_3_0@36586 -
U utils/fppkg/fppkg.pp
--- Recording mergeinfo for merge of r36550 into '.':
U .
--- Merging r36551 into '.':
U utils/fpcmkcfg/fppkg.cfg
--- Recording mergeinfo for merge of r36551 into '.':
G .
--- Merging r36552 into '.':
G utils/fpcmkcfg/fppkg.cfg
--- Recording mergeinfo for merge of r36552 into '.':
G .
--- Merging r36553 into '.':
C utils/fpcmkcfg/fppkg.inc
--- Recording mergeinfo for merge of r36553 into '.':
G .
Summary of conflicts:
Text conflicts: 1
# revisions: 36550,36551,36552,36553
git-svn-id: branches/fixes_3_0@36563 -
U packages/fpmkunit/src/fpmkunit.pp
--- Recording mergeinfo for merge of r34401 into '.':
U .
--- Merging r34403 into '.':
G packages/fpmkunit/src/fpmkunit.pp
--- Recording mergeinfo for merge of r34403 into '.':
G .
--- Merging r36529 into '.':
U packages/fppkg/src/pkgdownload.pp
--- Recording mergeinfo for merge of r36529 into '.':
G .
# revisions: 34401,34403,36529
git-svn-id: branches/fixes_3_0@36562 -
U packages/bzip2/src/bzip2.pas
U packages/bzip2/src/bzip2stream.pp
--- Recording mergeinfo for merge of r35459 into '.':
U .
# revisions: 35459
git-svn-id: branches/fixes_3_0@36560 -
U packages/openssl/src/openssl.pas
--- Recording mergeinfo for merge of r34476 into '.':
U .
--- Merging r35332 into '.':
G packages/openssl/src/openssl.pas
U packages/openssl/src/fpopenssl.pp
--- Recording mergeinfo for merge of r35332 into '.':
G .
--- Merging r35342 into '.':
G packages/openssl/src/openssl.pas
G packages/openssl/src/fpopenssl.pp
--- Recording mergeinfo for merge of r35342 into '.':
G .
--- Merging r35946 into '.':
U rtl/objpas/classes/compon.inc
--- Recording mergeinfo for merge of r35946 into '.':
G .
--- Merging r36062 into '.':
U .
--- Recording mergeinfo for merge of r36062 into '.':
G .
--- Merging r36215 into '.':
U packages/hash/src/md5.pp
--- Recording mergeinfo for merge of r36215 into '.':
G .
# revisions: 34476,35332,35342,35946,36062,36215
git-svn-id: branches/fixes_3_0@36559 -
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/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r36085 into '.':
U .
--- Merging r36118 into '.':
U packages/pastojs/tests/tcmodules.pas
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r36118 into '.':
G .
--- Merging r36156 into '.':
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r36156 into '.':
G .
--- Merging r36172 into '.':
G packages/pastojs/tests/tcmodules.pas
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r36172 into '.':
G .
--- Merging r36236 into '.':
G packages/pastojs/tests/tcmodules.pas
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r36236 into '.':
G .
--- Merging r36242 into '.':
G packages/pastojs/src/fppas2js.pp
G packages/pastojs/tests/tcmodules.pas
--- Recording mergeinfo for merge of r36242 into '.':
G .
--- Merging r36247 into '.':
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r36247 into '.':
G .
--- Merging r36319 into '.':
G packages/pastojs/tests/tcmodules.pas
U packages/pastojs/tests/tcoptimizations.pas
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r36319 into '.':
G .
--- Merging r36459 into '.':
G packages/pastojs/src/fppas2js.pp
G packages/pastojs/tests/tcmodules.pas
--- Recording mergeinfo for merge of r36459 into '.':
G .
--- Merging r36460 into '.':
G packages/pastojs/tests/tcmodules.pas
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r36460 into '.':
G .
# revisions: 36085,36118,36156,36172,36236,36242,36247,36319,36459,36460
git-svn-id: branches/fixes_3_0@36538 -
U packages/fcl-base/src/fpexprpars.pp
U packages/fcl-base/tests/fclbase-unittests.lpi
U packages/fcl-base/tests/testexprpars.pp
U packages/fcl-base/tests/fclbase-unittests.pp
--- Recording mergeinfo for merge of r33947 into '.':
U .
--- Merging r33986 into '.':
G packages/fcl-base/src/fpexprpars.pp
--- Recording mergeinfo for merge of r33986 into '.':
G .
--- Merging r34377 into '.':
G packages/fcl-base/src/fpexprpars.pp
G packages/fcl-base/tests/testexprpars.pp
--- Recording mergeinfo for merge of r34377 into '.':
G .
--- Merging r34422 into '.':
G packages/fcl-base/tests/testexprpars.pp
G packages/fcl-base/src/fpexprpars.pp
--- Recording mergeinfo for merge of r34422 into '.':
G .
--- Merging r34423 into '.':
G packages/fcl-base/src/fpexprpars.pp
G packages/fcl-base/tests/testexprpars.pp
--- Recording mergeinfo for merge of r34423 into '.':
G .
--- Merging r34967 into '.':
G packages/fcl-base/tests/testexprpars.pp
G packages/fcl-base/src/fpexprpars.pp
--- Recording mergeinfo for merge of r34967 into '.':
G .
--- Merging r35006 into '.':
G packages/fcl-base/src/fpexprpars.pp
--- Recording mergeinfo for merge of r35006 into '.':
G .
# revisions: 33947,33986,34377,34422,34423,34967,35006
git-svn-id: branches/fixes_3_0@36537 -
U packages/fcl-image/examples/drawing.pp
A packages/fcl-image/examples/pattern.png
--- Recording mergeinfo for merge of r36400 into '.':
U .
--- Merging r36401 into '.':
U packages/fcl-image/examples/imgconv.pp
--- Recording mergeinfo for merge of r36401 into '.':
G .
--- Merging r36402 into '.':
A packages/fcl-image/examples/textout.pp
U packages/fcl-image/src/freetype.pp
U packages/fcl-image/src/fpcdrawh.inc
U packages/fcl-image/src/fpcanvas.inc
U packages/fcl-image/src/fpcanvas.pp
U packages/fcl-image/src/ftfont.pp
--- Recording mergeinfo for merge of r36402 into '.':
G .
--- Merging r36403 into '.':
U packages/fcl-image/src/fppixlcanv.pp
--- Recording mergeinfo for merge of r36403 into '.':
G .
--- Merging r36404 into '.':
G packages/fcl-image/examples/drawing.pp
--- Recording mergeinfo for merge of r36404 into '.':
G .
# revisions: 36400,36401,36402,36403,36404
git-svn-id: branches/fixes_3_0@36536 -
U packages/fcl-js/src/jstree.pp
--- Recording mergeinfo for merge of r35789 into '.':
U .
--- Merging r36007 into '.':
U packages/pastojs/tests/tcoptimizations.pas
--- Recording mergeinfo for merge of r36007 into '.':
G .
--- Merging r36035 into '.':
U packages/pastojs/src/fppas2js.pp
U packages/pastojs/tests/tcmodules.pas
--- Recording mergeinfo for merge of r36035 into '.':
G .
--- Merging r36037 into '.':
G packages/pastojs/tests/tcmodules.pas
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r36037 into '.':
G .
--- Merging r36070 into '.':
G packages/pastojs/tests/tcmodules.pas
--- Recording mergeinfo for merge of r36070 into '.':
G .
--- Merging r36235 into '.':
G packages/fcl-js/src/jstree.pp
--- Recording mergeinfo for merge of r36235 into '.':
G .
--- Merging r36471 into '.':
G packages/fcl-js/src/jstree.pp
--- Recording mergeinfo for merge of r36471 into '.':
G .
--- Merging r36492 into '.':
A packages/fcl-js/tests/tcsrcmap.pas
U packages/fcl-js/tests/testjs.lpi
U packages/fcl-js/tests/testjs.lpr
U packages/fcl-js/src/jswriter.pp
A packages/fcl-js/src/jssrcmap.pas
--- Recording mergeinfo for merge of r36492 into '.':
G .
--- Merging r36493 into '.':
U packages/fcl-js/src/jssrcmap.pas
--- Recording mergeinfo for merge of r36493 into '.':
G .
--- Merging r36494 into '.':
G packages/fcl-js/src/jssrcmap.pas
--- Recording mergeinfo for merge of r36494 into '.':
G .
# revisions: 35789,36007,36035,36037,36070,36235,36471,36492,36493,36494
git-svn-id: branches/fixes_3_0@36535 -
U packages/fcl-passrc/src/pastree.pp
U packages/fcl-passrc/src/pasresolver.pp
U packages/fcl-passrc/src/passrcutil.pp
U packages/fcl-passrc/src/pasuseanalyzer.pas
U packages/fcl-passrc/src/pparser.pp
U packages/fcl-passrc/tests/tcmoduleparser.pas
U packages/fcl-passrc/tests/tcpassrcutil.pas
--- Recording mergeinfo for merge of r36006 into '.':
U .
--- Merging r36020 into '.':
U packages/fcl-passrc/src/paswrite.pp
--- Recording mergeinfo for merge of r36020 into '.':
G .
--- Merging r36069 into '.':
U packages/fcl-passrc/tests/tcbaseparser.pas
U packages/fcl-passrc/tests/tcresolver.pas
G packages/fcl-passrc/src/pastree.pp
G packages/fcl-passrc/src/pasresolver.pp
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r36069 into '.':
G .
--- Merging r36084 into '.':
G packages/fcl-passrc/tests/tcresolver.pas
G packages/fcl-passrc/src/pasuseanalyzer.pas
G packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r36084 into '.':
G .
--- Merging r36117 into '.':
G packages/fcl-passrc/tests/tcresolver.pas
G packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r36117 into '.':
G .
--- Merging r36121 into '.':
G packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r36121 into '.':
G .
--- Merging r36125 into '.':
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r36125 into '.':
G .
--- Merging r36126 into '.':
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r36126 into '.':
G .
--- Merging r36127 into '.':
U packages/fcl-passrc/src/pscanner.pp
U packages/fcl-passrc/tests/tcscanner.pas
G packages/fcl-passrc/tests/tcresolver.pas
--- Recording mergeinfo for merge of r36127 into '.':
G .
--- Merging r36129 into '.':
G packages/fcl-passrc/tests/tcscanner.pas
G packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r36129 into '.':
G .
--- Merging r36130 into '.':
U packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r36130 into '.':
G .
--- Merging r36131 into '.':
U packages/fcl-passrc/tests/tcscanner.pas
G packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r36131 into '.':
G .
--- Merging r36140 into '.':
G packages/fcl-passrc/tests/tcscanner.pas
G packages/fcl-passrc/src/pscanner.pp
G packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r36140 into '.':
G .
--- Merging r36154 into '.':
U packages/pastojs/tests/tcmodules.pas
U packages/pastojs/src/fppas2js.pp
G packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r36154 into '.':
G .
--- Merging r36155 into '.':
G packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r36155 into '.':
G .
--- Merging r36160 into '.':
G packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r36160 into '.':
G .
--- Merging r36161 into '.':
G packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r36161 into '.':
G .
--- Merging r36171 into '.':
G packages/fcl-passrc/src/pparser.pp
G packages/fcl-passrc/src/pasresolver.pp
G packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r36171 into '.':
G .
--- Merging r36177 into '.':
G packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r36177 into '.':
G .
--- Merging r36178 into '.':
G packages/fcl-passrc/tests/tcscanner.pas
G packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r36178 into '.':
G .
--- Merging r36179 into '.':
U packages/fcl-passrc/tests/tcvarparser.pas
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r36179 into '.':
G .
--- Merging r36181 into '.':
U packages/fcl-passrc/tests/tcstatements.pas
G packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r36181 into '.':
G .
--- Merging r36182 into '.':
G packages/fcl-passrc/src/pasresolver.pp
G packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r36182 into '.':
G .
--- Merging r36183 into '.':
G packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r36183 into '.':
G .
--- Merging r36184 into '.':
G packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r36184 into '.':
G .
--- Merging r36185 into '.':
G packages/fcl-passrc/tests/tcstatements.pas
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r36185 into '.':
G .
--- Merging r36186 into '.':
G packages/fcl-passrc/src/pparser.pp
U packages/fcl-passrc/tests/tcclasstype.pas
--- Recording mergeinfo for merge of r36186 into '.':
G .
--- Merging r36187 into '.':
U packages/fcl-passrc/tests/testpassrc.lpi
U packages/fcl-passrc/tests/tcexprparser.pas
--- Recording mergeinfo for merge of r36187 into '.':
G .
--- Merging r36188 into '.':
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r36188 into '.':
G .
--- Merging r36189 into '.':
G packages/fcl-passrc/tests/tcstatements.pas
G packages/fcl-passrc/tests/tcscanner.pas
G packages/fcl-passrc/src/pscanner.pp
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r36189 into '.':
G .
--- Merging r36190 into '.':
G packages/fcl-passrc/tests/tcexprparser.pas
G packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r36190 into '.':
G .
--- Merging r36192 into '.':
G packages/fcl-passrc/tests/tcscanner.pas
--- Recording mergeinfo for merge of r36192 into '.':
G .
--- Merging r36205 into '.':
G packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r36205 into '.':
G .
--- Merging r36213 into '.':
G packages/fcl-passrc/src/pscanner.pp
G packages/fcl-passrc/src/pparser.pp
G packages/fcl-passrc/src/pastree.pp
--- Recording mergeinfo for merge of r36213 into '.':
G .
--- Merging r36216 into '.':
G packages/fcl-passrc/src/pparser.pp
G packages/fcl-passrc/src/pastree.pp
G packages/fcl-passrc/tests/tcbaseparser.pas
G packages/fcl-passrc/tests/tcclasstype.pas
--- Recording mergeinfo for merge of r36216 into '.':
G .
--- Merging r36217 into '.':
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r36217 into '.':
G .
--- Merging r36218 into '.':
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r36218 into '.':
G .
--- Merging r36219 into '.':
G packages/fcl-passrc/src/pparser.pp
G packages/fcl-passrc/src/pastree.pp
--- Recording mergeinfo for merge of r36219 into '.':
G .
--- Merging r36220 into '.':
U packages/fcl-passrc/tests/tcgenerics.pp
--- Recording mergeinfo for merge of r36220 into '.':
G .
--- Merging r36221 into '.':
G packages/fcl-passrc/tests/tcgenerics.pp
--- Recording mergeinfo for merge of r36221 into '.':
G .
--- Merging r36222 into '.':
G packages/fcl-passrc/tests/tcgenerics.pp
G packages/fcl-passrc/src/pparser.pp
G packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r36222 into '.':
G .
--- Merging r36223 into '.':
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r36223 into '.':
G .
--- Merging r36224 into '.':
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r36224 into '.':
G .
--- Merging r36225 into '.':
G packages/fcl-passrc/tests/tcgenerics.pp
G packages/fcl-passrc/tests/tcresolver.pas
G packages/fcl-passrc/src/pparser.pp
G packages/fcl-passrc/src/pastree.pp
G packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r36225 into '.':
G .
--- Merging r36226 into '.':
G packages/fcl-passrc/tests/tcstatements.pas
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r36226 into '.':
G .
--- Merging r36228 into '.':
G packages/fcl-passrc/src/pparser.pp
U packages/fcl-passrc/tests/tctypeparser.pas
--- Recording mergeinfo for merge of r36228 into '.':
G .
--- Merging r36234 into '.':
G packages/fcl-passrc/tests/tcresolver.pas
G packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r36234 into '.':
G .
--- Merging r36237 into '.':
U packages/fcl-passrc/examples/parsepp.pp
--- Recording mergeinfo for merge of r36237 into '.':
G .
--- Merging r36238 into '.':
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r36238 into '.':
G .
--- Merging r36241 into '.':
G packages/fcl-passrc/src/pastree.pp
G packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r36241 into '.':
G .
--- Merging r36246 into '.':
G packages/fcl-passrc/src/pastree.pp
G packages/fcl-passrc/src/pasresolver.pp
G packages/fcl-passrc/tests/tcresolver.pas
--- Recording mergeinfo for merge of r36246 into '.':
G .
--- Merging r36248 into '.':
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r36248 into '.':
G .
--- Merging r36318 into '.':
G packages/fcl-passrc/src/pasresolver.pp
G packages/fcl-passrc/src/pasuseanalyzer.pas
G packages/fcl-passrc/src/pparser.pp
A packages/fcl-passrc/src/pasresolveeval.pas
G packages/fcl-passrc/tests/tcresolver.pas
U packages/fcl-passrc/tests/tcuseanalyzer.pas
U packages/fcl-passrc/tests/testpassrc.lpr
--- Recording mergeinfo for merge of r36318 into '.':
G .
--- Merging r36320 into '.':
G packages/fcl-passrc/tests/tcresolver.pas
G packages/fcl-passrc/src/pasresolver.pp
G packages/fcl-passrc/src/pasuseanalyzer.pas
--- Recording mergeinfo for merge of r36320 into '.':
G .
--- Merging r36321 into '.':
U packages/fcl-passrc/fpmake.pp
--- Recording mergeinfo for merge of r36321 into '.':
G .
--- Merging r36376 into '.':
G packages/fcl-passrc/tests/tcresolver.pas
U packages/fcl-passrc/src/pasresolveeval.pas
G packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r36376 into '.':
G .
--- Merging r36397 into '.':
G packages/fcl-passrc/tests/tcresolver.pas
G packages/fcl-passrc/src/pasresolveeval.pas
--- Recording mergeinfo for merge of r36397 into '.':
G .
--- Merging r36453 into '.':
G packages/fcl-passrc/src/pasresolveeval.pas
G packages/fcl-passrc/src/pastree.pp
G packages/fcl-passrc/src/pasresolver.pp
G packages/fcl-passrc/tests/tcresolver.pas
--- Recording mergeinfo for merge of r36453 into '.':
G .
--- Merging r36458 into '.':
G packages/fcl-passrc/tests/tcresolver.pas
G packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r36458 into '.':
G .
# revisions: 36006,36020,36069,36084,36117,36121,36125,36126,36127,36129,36130,36131,36140,36154,36155,36160,36161,36171,36177,36178,36179,36181,36182,36183,36184,36185,36186,36187,36188,36189,36190,36192,36205,36213,36216,36217,36218,36219,36220,36221,36222,36223,36224,36225,36226,36228,36234,36237,36238,36241,36246,36248,36318,36320,36321,36376,36397,36453,36458
git-svn-id: branches/fixes_3_0@36534 -
U rtl/objpas/classes/lists.inc
--- Recording mergeinfo for merge of r34462 into '.':
U .
--- Merging r34861 into '.':
G rtl/objpas/classes/lists.inc
--- Recording mergeinfo for merge of r34861 into '.':
G .
# revisions: 34462,34861
git-svn-id: branches/fixes_3_0@36533 -
U packages/fcl-fpcunit/src/fpcunit.pp
--- Recording mergeinfo for merge of r35878 into '.':
U .
# revisions: 35878
git-svn-id: branches/fixes_3_0@36532 -
U rtl/go32v2/go32.pp
--- Recording mergeinfo for merge of r36481 into '.':
U .
--- Merging r36482 into '.':
G rtl/go32v2/go32.pp
--- Recording mergeinfo for merge of r36482 into '.':
G .
--- Merging r36483 into '.':
G rtl/go32v2/go32.pp
--- Recording mergeinfo for merge of r36483 into '.':
G .
# revisions: 36481,36482,36483
git-svn-id: branches/fixes_3_0@36500 -
U rtl/objpas/fpwidestring.pp
--- Recording mergeinfo for merge of r36461 into '.':
U .
--- Merging r36477 into '.':
U packages/x11/src/xlib.pp
--- Recording mergeinfo for merge of r36477 into '.':
G .
# revisions: 36461,36477
git-svn-id: branches/fixes_3_0@36478 -
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/x11/src/keysym.pp
--- Recording mergeinfo for merge of r36405 into '.':
U .
--- Merging r36408 into '.':
U packages/x11/fpmake.pp
A packages/x11/src/xf86keysym.pp
A packages/x11/src/sunkeysym.pp
A packages/x11/src/hpkeysym.pp
A packages/x11/src/deckeysym.pp
--- Recording mergeinfo for merge of r36408 into '.':
G .
# revisions: 36405,36408
git-svn-id: branches/fixes_3_0@36414 -
