| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
U utils/creumap.pp
G .
--- Recording mergeinfo for merge of r37132 into '.':
G .
git-svn-id: https://svn.freepascal.org/svn/fpc/tags/release_3_0_4@37133 3ad0048d-3df7-0310-abae-a5850022a9f2
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
U utils/creumap.pp
--- Recording mergeinfo for merge of r36438 into '.':
U .
# revisions: 36438
git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@37132 3ad0048d-3df7-0310-abae-a5850022a9f2
|
| |/
|
|
| |
git-svn-id: https://svn.freepascal.org/svn/fpc/tags/release_3_0_4@37116 3ad0048d-3df7-0310-abae-a5850022a9f2
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36563 3ad0048d-3df7-0310-abae-a5850022a9f2
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36558 3ad0048d-3df7-0310-abae-a5850022a9f2
|
| |
|
|
|
|
|
|
|
|
|
|
| |
U utils/h2pas/h2pas.y
U utils/h2pas/h2pas.pas
--- Recording mergeinfo for merge of r35475 into '.':
U .
# revisions: 35475
git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36076 3ad0048d-3df7-0310-abae-a5850022a9f2
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
U utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r34840 into '.':
U .
--- Merging r34841 into '.':
G utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r34841 into '.':
G .
--- Merging r34842 into '.':
G utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r34842 into '.':
G .
--- Merging r34843 into '.':
G utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r34843 into '.':
G .
--- Merging r34844 into '.':
G utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r34844 into '.':
G .
--- Merging r34845 into '.':
G utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r34845 into '.':
G .
--- Merging r34848 into '.':
G utils/pas2jni/writer.pas
U utils/pas2jni/def.pas
U utils/pas2jni/ppuparser.pas
--- Recording mergeinfo for merge of r34848 into '.':
G .
--- Merging r34862 into '.':
G utils/pas2jni/def.pas
G utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r34862 into '.':
G .
--- Merging r34863 into '.':
G utils/pas2jni/def.pas
G utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r34863 into '.':
G .
--- Merging r34951 into '.':
G utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r34951 into '.':
G .
--- Merging r34952 into '.':
G utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r34952 into '.':
G .
--- Merging r34953 into '.':
G utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r34953 into '.':
G .
--- Merging r34954 into '.':
G utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r34954 into '.':
G .
--- Merging r35779 into '.':
G utils/pas2jni/def.pas
G utils/pas2jni/ppuparser.pas
G utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r35779 into '.':
G .
# revisions: 34840,34841,34842,34843,34844,34845,34848,34862,34863,34951,34952,34953,34954,35779
git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36051 3ad0048d-3df7-0310-abae-a5850022a9f2
|
| |
|
|
|
|
| |
35782,35790,35791,35793,35794,35795,35798,35799,35800,35801,35802,35803,35804,35805,35806,35808,35809,35810,35811
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@35987 3ad0048d-3df7-0310-abae-a5850022a9f2
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
U packages/fcl-json/tests/testjsonrtti.pp
U packages/fcl-json/src/fpjsonrtti.pp
--- Recording mergeinfo for merge of r35565 into '.':
U .
--- Merging r35571 into '.':
U packages/fcl-passrc/src/pparser.pp
U packages/fcl-passrc/tests/testpassrc.lpi
A packages/fcl-passrc/tests/tcgenerics.pp
U packages/fcl-passrc/tests/tctypeparser.pas
U packages/fcl-passrc/tests/testpassrc.lpr
--- Recording mergeinfo for merge of r35571 into '.':
G .
--- Merging r35574 into '.':
U packages/pastojs/fpmake.pp
--- Recording mergeinfo for merge of r35574 into '.':
G .
--- Merging r35576 into '.':
U packages/fcl-js/src/jsscanner.pp
--- Recording mergeinfo for merge of r35576 into '.':
G .
--- Merging r35577 into '.':
U packages/fcl-js/tests/tcwriter.pp
U packages/fcl-js/src/jswriter.pp
--- Recording mergeinfo for merge of r35577 into '.':
G .
--- Merging r35578 into '.':
U packages/fcl-passrc/src/pastree.pp
--- Recording mergeinfo for merge of r35578 into '.':
G .
--- Merging r35579 into '.':
U packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r35579 into '.':
G .
--- Merging r35580 into '.':
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r35580 into '.':
G .
--- Merging r35581 into '.':
U packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r35581 into '.':
G .
--- Merging r35582 into '.':
U packages/fcl-passrc/tests/tcresolver.pas
--- Recording mergeinfo for merge of r35582 into '.':
G .
--- Merging r35583 into '.':
U packages/pastojs/tests/tcmodules.pas
--- Recording mergeinfo for merge of r35583 into '.':
G .
--- Merging r35584 into '.':
U packages/fcl-passrc/tests/tcbaseparser.pas
--- Recording mergeinfo for merge of r35584 into '.':
G .
--- Merging r35585 into '.':
U packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r35585 into '.':
G .
--- Merging r35586 into '.':
G packages/fcl-passrc/tests/testpassrc.lpr
A packages/fcl-passrc/tests/tcuseanalyzer.pas
G packages/fcl-passrc/tests/testpassrc.lpi
A packages/fcl-passrc/src/pasuseanalyzer.pas
--- Recording mergeinfo for merge of r35586 into '.':
G .
--- Merging r35587 into '.':
U packages/pastojs/tests/testpas2js.lpi
--- Recording mergeinfo for merge of r35587 into '.':
G .
--- Merging r35588 into '.':
G packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r35588 into '.':
G .
--- Merging r35591 into '.':
U packages/fcl-passrc/tests/tcexprparser.pas
U packages/fcl-passrc/tests/tcgenerics.pp
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r35591 into '.':
G .
--- Merging r35593 into '.':
U packages/fcl-passrc/tests/tcstatements.pas
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r35593 into '.':
G .
--- Merging r35597 into '.':
U packages/fcl-passrc/tests/tcprocfunc.pas
G packages/fcl-passrc/src/pastree.pp
--- Recording mergeinfo for merge of r35597 into '.':
G .
--- Merging r35612 into '.':
G packages/fcl-passrc/tests/tcgenerics.pp
G packages/fcl-passrc/src/pparser.pp
G packages/fcl-passrc/src/pastree.pp
--- Recording mergeinfo for merge of r35612 into '.':
G .
--- Merging r35613 into '.':
G packages/fcl-passrc/tests/tcresolver.pas
G packages/fcl-passrc/src/pasresolver.pp
G packages/fcl-passrc/src/pscanner.pp
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r35613 into '.':
G .
--- Merging r35614 into '.':
U packages/fcl-passrc/tests/tcuseanalyzer.pas
U packages/fcl-passrc/src/pasuseanalyzer.pas
--- Recording mergeinfo for merge of r35614 into '.':
G .
--- Merging r35615 into '.':
G packages/pastojs/src/fppas2js.pp
U packages/pastojs/tests/testpas2js.pp
G packages/pastojs/tests/tcmodules.pas
A packages/pastojs/tests/tcoptimizations.pas
G packages/pastojs/tests/testpas2js.lpi
--- Recording mergeinfo for merge of r35615 into '.':
G .
--- Merging r35616 into '.':
G packages/fcl-passrc/tests/tcgenerics.pp
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r35616 into '.':
G .
--- Merging r35617 into '.':
G packages/fcl-passrc/tests/tcgenerics.pp
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r35617 into '.':
G .
--- Merging r35621 into '.':
G packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r35621 into '.':
G .
--- Merging r35623 into '.':
U packages/fcl-web/src/base/fpweb.pp
--- Recording mergeinfo for merge of r35623 into '.':
G .
--- Merging r35625 into '.':
U packages/fcl-passrc/tests/tcscanner.pas
G packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r35625 into '.':
G .
--- Merging r35631 into '.':
U utils/pas2js/dist/rtl.js
G packages/fcl-passrc/src/pasresolver.pp
G packages/pastojs/tests/tcmodules.pas
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r35631 into '.':
G .
--- Merging r35633 into '.':
G packages/fcl-js/src/jswriter.pp
G packages/fcl-passrc/tests/tcresolver.pas
G packages/fcl-passrc/src/pastree.pp
G packages/fcl-passrc/src/pasresolver.pp
U packages/pastojs/tests/tcconverter.pp
G packages/pastojs/tests/tcmodules.pas
U packages/pastojs/tests/tcoptimizations.pas
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r35633 into '.':
G .
--- Merging r35635 into '.':
G packages/fcl-passrc/tests/testpassrc.lpi
U packages/fcl-passrc/tests/tcclasstype.pas
G packages/fcl-passrc/src/pastree.pp
G packages/fcl-passrc/src/pscanner.pp
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r35635 into '.':
G .
--- Merging r35636 into '.':
G packages/fcl-passrc/tests/tcresolver.pas
G packages/fcl-passrc/tests/tcclasstype.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 r35636 into '.':
G .
--- Merging r35637 into '.':
G packages/fcl-passrc/tests/tcclasstype.pas
G packages/fcl-passrc/tests/tcresolver.pas
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r35637 into '.':
G .
--- Merging r35638 into '.':
G packages/fcl-passrc/tests/tcresolver.pas
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r35638 into '.':
G .
--- Merging r35639 into '.':
G packages/fcl-passrc/src/pparser.pp
U packages/fcl-passrc/tests/tcvarparser.pas
G packages/fcl-passrc/tests/tcclasstype.pas
G packages/fcl-passrc/tests/tcresolver.pas
--- Recording mergeinfo for merge of r35639 into '.':
G .
--- Merging r35640 into '.':
G packages/fcl-js/src/jswriter.pp
--- Recording mergeinfo for merge of r35640 into '.':
G .
--- Merging r35641 into '.':
G packages/fcl-passrc/tests/tcstatements.pas
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r35641 into '.':
G .
--- Merging r35642 into '.':
G packages/fcl-passrc/src/pasresolver.pp
G packages/fcl-passrc/tests/tcresolver.pas
--- Recording mergeinfo for merge of r35642 into '.':
G .
--- Merging r35643 into '.':
G packages/pastojs/src/fppas2js.pp
G packages/pastojs/tests/tcmodules.pas
--- Recording mergeinfo for merge of r35643 into '.':
G .
--- Merging r35644 into '.':
U packages/fcl-json/src/jsonconf.pp
--- Recording mergeinfo for merge of r35644 into '.':
G .
--- Merging r35648 into '.':
U packages/fcl-passrc/fpmake.pp
--- Recording mergeinfo for merge of r35648 into '.':
G .
--- Merging r35651 into '.':
G packages/fcl-js/src/jswriter.pp
--- Recording mergeinfo for merge of r35651 into '.':
G .
--- Merging r35652 into '.':
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r35652 into '.':
G .
--- Merging r35653 into '.':
G packages/pastojs/tests/tcmodules.pas
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r35653 into '.':
G .
--- Merging r35667 into '.':
G packages/fcl-passrc/tests/tcresolver.pas
G packages/fcl-passrc/tests/tcuseanalyzer.pas
G packages/fcl-passrc/src/pastree.pp
G packages/fcl-passrc/src/pasresolver.pp
G packages/fcl-passrc/src/pasuseanalyzer.pas
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r35667 into '.':
G .
--- Merging r35668 into '.':
G packages/pastojs/tests/tcconverter.pp
G packages/pastojs/tests/tcmodules.pas
G packages/pastojs/tests/tcoptimizations.pas
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r35668 into '.':
G .
--- Merging r35680 into '.':
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r35680 into '.':
G .
--- Merging r35681 into '.':
G packages/fcl-passrc/src/pasresolver.pp
G packages/fcl-passrc/tests/tcresolver.pas
--- Recording mergeinfo for merge of r35681 into '.':
G .
--- Merging r35682 into '.':
G packages/fcl-passrc/src/pasuseanalyzer.pas
G packages/fcl-passrc/tests/tcuseanalyzer.pas
--- Recording mergeinfo for merge of r35682 into '.':
G .
--- Merging r35683 into '.':
G packages/pastojs/tests/tcmodules.pas
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r35683 into '.':
G .
--- Merging r35691 into '.':
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r35691 into '.':
G .
--- Merging r35692 into '.':
G packages/fcl-passrc/tests/tcresolver.pas
G packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r35692 into '.':
G .
--- Merging r35693 into '.':
G packages/pastojs/tests/tcmodules.pas
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r35693 into '.':
G .
--- Merging r35694 into '.':
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r35694 into '.':
G .
--- Merging r35695 into '.':
G packages/fcl-passrc/tests/tcresolver.pas
G packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r35695 into '.':
G .
--- Merging r35696 into '.':
G packages/pastojs/tests/tcmodules.pas
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r35696 into '.':
G .
--- Merging r35697 into '.':
G packages/fcl-passrc/tests/tcresolver.pas
G packages/fcl-passrc/tests/tcuseanalyzer.pas
G packages/fcl-passrc/src/pasuseanalyzer.pas
G packages/pastojs/tests/tcmodules.pas
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r35697 into '.':
G .
--- Merging r35702 into '.':
G packages/fcl-passrc/tests/tcbaseparser.pas
G packages/fcl-passrc/tests/tcresolver.pas
G packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r35702 into '.':
G .
--- Merging r35703 into '.':
G packages/fcl-passrc/tests/tcuseanalyzer.pas
G packages/fcl-passrc/src/pasuseanalyzer.pas
--- Recording mergeinfo for merge of r35703 into '.':
G .
--- Merging r35704 into '.':
G packages/pastojs/src/fppas2js.pp
G packages/pastojs/tests/tcmodules.pas
--- Recording mergeinfo for merge of r35704 into '.':
G .
--- Merging r35705 into '.':
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r35705 into '.':
G .
--- Merging r35706 into '.':
G packages/pastojs/tests/tcmodules.pas
--- Recording mergeinfo for merge of r35706 into '.':
G .
--- Merging r35708 into '.':
G packages/fcl-passrc/src/pasresolver.pp
G packages/fcl-passrc/tests/tcuseanalyzer.pas
--- Recording mergeinfo for merge of r35708 into '.':
G .
--- Merging r35709 into '.':
G packages/fcl-passrc/tests/tcresolver.pas
G packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r35709 into '.':
G .
--- Merging r35710 into '.':
G packages/fcl-passrc/tests/tcresolver.pas
G packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r35710 into '.':
G .
--- Merging r35711 into '.':
G packages/pastojs/tests/tcmodules.pas
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r35711 into '.':
G .
--- Merging r35713 into '.':
G packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r35713 into '.':
G .
--- Merging r35714 into '.':
G packages/pastojs/tests/tcmodules.pas
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r35714 into '.':
G .
--- Merging r35715 into '.':
G packages/fcl-passrc/src/pastree.pp
G packages/fcl-passrc/src/pasresolver.pp
G packages/fcl-passrc/src/pasuseanalyzer.pas
--- Recording mergeinfo for merge of r35715 into '.':
G .
--- Merging r35716 into '.':
G packages/pastojs/tests/tcmodules.pas
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r35716 into '.':
G .
--- Merging r35718 into '.':
G packages/pastojs/tests/tcmodules.pas
G packages/pastojs/src/fppas2js.pp
G packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r35718 into '.':
G .
--- Merging r35719 into '.':
G packages/pastojs/src/fppas2js.pp
G packages/fcl-passrc/tests/tcresolver.pas
G packages/fcl-passrc/tests/tcuseanalyzer.pas
G packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r35719 into '.':
G .
--- Merging r35720 into '.':
G packages/fcl-passrc/tests/tcresolver.pas
G packages/fcl-passrc/tests/tcuseanalyzer.pas
G packages/fcl-passrc/src/pasresolver.pp
G packages/fcl-passrc/src/pasuseanalyzer.pas
--- Recording mergeinfo for merge of r35720 into '.':
G .
--- Merging r35728 into '.':
G 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/pscanner.pp
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r35728 into '.':
G .
--- Merging r35729 into '.':
G packages/pastojs/src/fppas2js.pp
G packages/pastojs/tests/tcmodules.pas
--- Recording mergeinfo for merge of r35729 into '.':
G .
--- Merging r35731 into '.':
G packages/fcl-passrc/src/pasuseanalyzer.pas
G packages/fcl-passrc/src/pparser.pp
G packages/fcl-passrc/src/pasresolver.pp
G packages/fcl-passrc/tests/tcresolver.pas
G packages/fcl-passrc/tests/tcuseanalyzer.pas
--- Recording mergeinfo for merge of r35731 into '.':
G .
--- Merging r35732 into '.':
G packages/pastojs/src/fppas2js.pp
G packages/pastojs/tests/tcmodules.pas
--- Recording mergeinfo for merge of r35732 into '.':
G .
--- Merging r35735 into '.':
G packages/fcl-passrc/tests/tcresolver.pas
G packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r35735 into '.':
G .
--- Merging r35736 into '.':
G packages/pastojs/src/fppas2js.pp
G packages/pastojs/tests/tcmodules.pas
--- Recording mergeinfo for merge of r35736 into '.':
G .
--- Merging r35737 into '.':
G packages/fcl-passrc/tests/tcuseanalyzer.pas
--- Recording mergeinfo for merge of r35737 into '.':
G .
--- Merging r35738 into '.':
G packages/pastojs/tests/tcmodules.pas
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r35738 into '.':
G .
# revisions: 35565,35571,35574,35576,35577,35578,35579,35580,35581,35582,35583,35584,35585,35586,35587,35588,35591,35593,35597,35612,35613,35614,35615,35616,35617,35621,35623,35625,35631,35633,35635,35636,35637,35638,35639,35640,35641,35642,35643,35644,35648,35651,35652,35653,35667,35668,35680,35681,35682,35683,35691,35692,35693,35694,35695,35696,35697,35702,35703,35704,35705,35706,35708,35709,35710,35711,35713,35714,35715,35716,35718,35719,35720,35728,35729,35731,35732,35735,35736,35737,35738
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@35986 3ad0048d-3df7-0310-abae-a5850022a9f2
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
U packages/pastojs/tests/tcconverter.pp
U packages/pastojs/tests/tcmodules.pas
U packages/pastojs/src/fppas2js.pp
U packages/fcl-js/src/jstree.pp
U packages/fcl-passrc/src/pasresolver.pp
U packages/fcl-passrc/src/pparser.pp
U packages/fcl-passrc/src/pastree.pp
U packages/fcl-passrc/tests/tcresolver.pas
--- Recording mergeinfo for merge of r35428 into '.':
U .
--- Merging r35468 into '.':
U packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r35468 into '.':
G .
--- Merging r35469 into '.':
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r35469 into '.':
G .
--- Merging r35470 into '.':
G packages/fcl-passrc/src/pasresolver.pp
G packages/fcl-passrc/tests/tcresolver.pas
--- Recording mergeinfo for merge of r35470 into '.':
G .
--- Merging r35472 into '.':
G packages/pastojs/tests/tcmodules.pas
G packages/pastojs/src/fppas2js.pp
U utils/pas2js/dist/rtl.js
--- Recording mergeinfo for merge of r35472 into '.':
G .
--- Merging r35487 into '.':
G packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r35487 into '.':
G .
--- Merging r35488 into '.':
U packages/fcl-passrc/tests/tcbaseparser.pas
G packages/fcl-passrc/src/pastree.pp
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r35488 into '.':
G .
--- Merging r35489 into '.':
G packages/fcl-passrc/tests/tcresolver.pas
G packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r35489 into '.':
G .
--- Merging r35490 into '.':
G packages/fcl-js/src/jstree.pp
--- Recording mergeinfo for merge of r35490 into '.':
G .
--- Merging r35491 into '.':
G packages/pastojs/tests/tcmodules.pas
G packages/pastojs/src/fppas2js.pp
G utils/pas2js/dist/rtl.js
--- Recording mergeinfo for merge of r35491 into '.':
G .
--- Merging r35502 into '.':
U packages/fcl-js/src/jswriter.pp
--- Recording mergeinfo for merge of r35502 into '.':
G .
--- Merging r35503 into '.':
G packages/fcl-passrc/src/pparser.pp
G packages/fcl-passrc/src/pastree.pp
G packages/fcl-passrc/src/pasresolver.pp
U packages/fcl-passrc/src/passrcutil.pp
G packages/fcl-passrc/src/pscanner.pp
U packages/fcl-passrc/tests/tcexprparser.pas
G packages/fcl-passrc/tests/tcresolver.pas
U packages/fcl-passrc/tests/tcvarparser.pas
--- Recording mergeinfo for merge of r35503 into '.':
G .
--- Merging r35504 into '.':
G packages/pastojs/tests/tcmodules.pas
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r35504 into '.':
G .
--- Merging r35505 into '.':
G utils/pas2js/dist/rtl.js
--- Recording mergeinfo for merge of r35505 into '.':
G .
--- Merging r35512 into '.':
U packages/fcl-web/src/base/httpdefs.pp
--- Recording mergeinfo for merge of r35512 into '.':
G .
--- Merging r35513 into '.':
G packages/fcl-web/src/base/httpdefs.pp
--- Recording mergeinfo for merge of r35513 into '.':
G .
--- Merging r35514 into '.':
U packages/fcl-web/src/base/custcgi.pp
--- Recording mergeinfo for merge of r35514 into '.':
G .
--- Merging r35515 into '.':
U packages/fcl-web/src/base/httproute.pp
--- Recording mergeinfo for merge of r35515 into '.':
G .
--- Merging r35516 into '.':
U packages/fcl-web/src/base/fphttpclient.pp
--- Recording mergeinfo for merge of r35516 into '.':
G .
--- Merging r35522 into '.':
U packages/fcl-passrc/tests/tcclasstype.pas
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r35522 into '.':
G .
--- Merging r35524 into '.':
G packages/fcl-passrc/src/pparser.pp
U packages/fcl-passrc/tests/tcprocfunc.pas
--- Recording mergeinfo for merge of r35524 into '.':
G .
--- Merging r35561 into '.':
U packages/fcl-json/src/fpjsonrtti.pp
U packages/fcl-json/tests/testjsonrtti.pp
--- Recording mergeinfo for merge of r35561 into '.':
G .
--- Merging r35562 into '.':
G packages/fcl-passrc/src/pscanner.pp
G packages/fcl-passrc/src/pparser.pp
U packages/fcl-passrc/tests/tcscanner.pas
--- Recording mergeinfo for merge of r35562 into '.':
G .
# revisions: 35428,35468,35469,35470,35472,35487,35488,35489,35490,35491,35502,35503,35504,35505,35512,35513,35514,35515,35516,35522,35524,35561,35562
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@35984 3ad0048d-3df7-0310-abae-a5850022a9f2
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
U packages/fcl-web/examples/echo/cgi/echo.lpi
U packages/fcl-web/examples/echo/cgi/echo.res
U packages/fcl-web/examples/httpclient/httpget.lpi
U packages/fcl-web/examples/httpapp/testhttp.pp
U packages/fcl-web/examples/httpapp/testhttp.lpi
U packages/fcl-web/examples/httpserver/simplehttpserver.lpi
A packages/fcl-web/examples/routing
A packages/fcl-web/examples/routing/demorouting.lpr
A packages/fcl-web/examples/routing/README
A packages/fcl-web/examples/routing/demorouting.lpi
A packages/fcl-web/examples/routing/routes.pp
A packages/fcl-web/examples/routing/sample.ini
U packages/fcl-web/fpmake.pp
A packages/fcl-web/tests/testfpweb.lpr
A packages/fcl-web/tests/tchttproute.pp
A packages/fcl-web/tests/testfpweb.lpi
U packages/fcl-web/src/base/fphttp.pp
A packages/fcl-web/src/base/tcwebmodule.pp
U packages/fcl-web/src/base/custweb.pp
U packages/fcl-web/src/base/httpdefs.pp
U packages/fcl-web/src/base/README.txt
A packages/fcl-web/src/base/httproute.pp
--- Recording mergeinfo for merge of r35292 into '.':
U .
--- Merging r35296 into '.':
U packages/fcl-json/fpmake.pp
A packages/fcl-json/tests/testjson2code.lpr
A packages/fcl-json/tests/testjson2code.lpi
A packages/fcl-json/tests/tcjsontocode.pp
A packages/fcl-json/src/fpjsontopas.pp
--- Recording mergeinfo for merge of r35296 into '.':
G .
--- Merging r35343 into '.':
U packages/fcl-json/tests/testjsondata.pp
U packages/fcl-json/src/fpjson.pp
--- Recording mergeinfo for merge of r35343 into '.':
G .
--- Merging r35384 into '.':
A utils/pas2js/dist
A utils/pas2js/dist/rtl.js
--- Recording mergeinfo for merge of r35384 into '.':
G .
--- Merging r35416 into '.':
U packages/fcl-js/src/jsbase.pp
U packages/fcl-js/src/jswriter.pp
--- Recording mergeinfo for merge of r35416 into '.':
G .
--- Merging r35417 into '.':
U packages/pastojs/src/fppas2js.pp
U packages/pastojs/tests/tcconverter.pp
U packages/pastojs/tests/tcmodules.pas
--- Recording mergeinfo for merge of r35417 into '.':
G .
--- Merging r35418 into '.':
U utils/pas2js/dist/rtl.js
--- Recording mergeinfo for merge of r35418 into '.':
G .
--- Merging r35429 into '.':
G utils/pas2js/dist/rtl.js
--- Recording mergeinfo for merge of r35429 into '.':
G .
--- Merging r35471 into '.':
G packages/fcl-js/src/jsbase.pp
G packages/fcl-js/src/jswriter.pp
--- Recording mergeinfo for merge of r35471 into '.':
G .
# revisions: 35292,35296,35343,35384,35416,35417,35418,35429,35471
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@35983 3ad0048d-3df7-0310-abae-a5850022a9f2
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
U packages/fcl-passrc/src/pparser.pp
U packages/fcl-passrc/src/pastree.pp
U packages/fcl-passrc/tests/tcclasstype.pas
--- Recording mergeinfo for merge of r34878 into '.':
U .
--- Merging r34879 into '.':
U packages/fcl-passrc/tests/tcscanner.pas
U packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r34879 into '.':
G .
--- Merging r34880 into '.':
U packages/fcl-passrc/tests/tctypeparser.pas
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r34880 into '.':
G .
--- Merging r34881 into '.':
G packages/fcl-passrc/src/pparser.pp
G packages/fcl-passrc/src/pastree.pp
G packages/fcl-passrc/tests/tcclasstype.pas
--- Recording mergeinfo for merge of r34881 into '.':
G .
--- Merging r34882 into '.':
U packages/fcl-passrc/tests/tcstatements.pas
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r34882 into '.':
G .
--- Merging r34883 into '.':
G packages/fcl-passrc/tests/tcscanner.pas
G packages/fcl-passrc/tests/tctypeparser.pas
U packages/fcl-passrc/tests/tcvarparser.pas
G packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r34883 into '.':
G .
--- Merging r35120 into '.':
U compiler/powerpc/cgcpu.pas
U compiler/powerpc/agppcmpw.pas
U compiler/assemble.pas
U compiler/script.pas
U compiler/powerpc64/cgcpu.pas
U utils/fpdoc/intl/dwriter.de.po
--- Recording mergeinfo for merge of r35120 into '.':
G .
--- Merging r35346 into '.':
U packages/fcl-passrc/tests/tcprocfunc.pas
G packages/fcl-passrc/src/pparser.pp
G packages/fcl-passrc/src/pastree.pp
--- Recording mergeinfo for merge of r35346 into '.':
G .
--- Merging r35353 into '.':
U packages/fcl-passrc/tests/tconstparser.pas
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r35353 into '.':
G .
--- Merging r35357 into '.':
G packages/fcl-passrc/src/pparser.pp
G packages/fcl-passrc/src/pscanner.pp
G packages/fcl-passrc/tests/tcscanner.pas
--- Recording mergeinfo for merge of r35357 into '.':
G .
--- Merging r35358 into '.':
A packages/fcl-passrc/examples/parsepp.pp
--- Recording mergeinfo for merge of r35358 into '.':
G .
--- Merging r35359 into '.':
U packages/fcl-passrc/examples/test_parser.pp
--- Recording mergeinfo for merge of r35359 into '.':
G .
--- Merging r35360 into '.':
G packages/fcl-passrc/src/pparser.pp
G packages/fcl-passrc/src/pastree.pp
G packages/fcl-passrc/tests/tctypeparser.pas
--- Recording mergeinfo for merge of r35360 into '.':
G .
--- Merging r35361 into '.':
G packages/fcl-passrc/tests/tcprocfunc.pas
G packages/fcl-passrc/src/pastree.pp
--- Recording mergeinfo for merge of r35361 into '.':
G .
--- Merging r35362 into '.':
G packages/fcl-passrc/src/pparser.pp
G packages/fcl-passrc/tests/tcstatements.pas
--- Recording mergeinfo for merge of r35362 into '.':
G .
--- Merging r35383 into '.':
U packages/fcl-js/src/jswriter.pp
U packages/pastojs/tests/tcconverter.pp
U packages/pastojs/tests/tcmodules.pas
U packages/pastojs/src/fppas2js.pp
U packages/fcl-passrc/tests/testpassrc.lpi
G packages/fcl-passrc/tests/tcclasstype.pas
G packages/fcl-passrc/tests/tcstatements.pas
U packages/fcl-passrc/tests/tcresolver.pas
G packages/fcl-passrc/src/pscanner.pp
G packages/fcl-passrc/src/pparser.pp
U packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r35383 into '.':
G .
--- Merging r35391 into '.':
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r35391 into '.':
G .
--- Merging r35402 into '.':
G packages/pastojs/src/fppas2js.pp
G packages/pastojs/tests/tcconverter.pp
G packages/pastojs/tests/tcmodules.pas
G packages/fcl-passrc/src/pasresolver.pp
G packages/fcl-passrc/src/pscanner.pp
G packages/fcl-passrc/src/pparser.pp
U packages/fcl-passrc/examples/parsepp.pp
G packages/fcl-passrc/tests/tcresolver.pas
G packages/fcl-js/src/jswriter.pp
--- Recording mergeinfo for merge of r35402 into '.':
G .
--- Merging r35415 into '.':
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
G packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r35415 into '.':
G .
--- Merging r35420 into '.':
U utils/fpdoc/dw_man.pp
--- Recording mergeinfo for merge of r35420 into '.':
G .
# revisions: 34878,34879,34880,34881,34882,34883,35120,35346,35353,35357,35358,35359,35360,35361,35362,35383,35391,35402,35415,35420
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@35981 3ad0048d-3df7-0310-abae-a5850022a9f2
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
U packages/fcl-passrc/tests/tcexprparser.pas
U packages/fcl-passrc/tests/tctypeparser.pas
U packages/fcl-passrc/tests/tcresolver.pas
U packages/fcl-passrc/src/pparser.pp
U packages/fcl-passrc/src/pastree.pp
U packages/fcl-passrc/src/pasresolver.pp
U packages/fcl-passrc/src/pscanner.pp
U packages/pastojs/tests/tcconverter.pp
--- Recording mergeinfo for merge of r34555 into '.':
U .
--- Merging r34569 into '.':
G packages/pastojs/tests/tcconverter.pp
U packages/fcl-passrc/tests/tcbaseparser.pas
U packages/fcl-passrc/tests/tcclasstype.pas
U packages/fcl-passrc/tests/tcstatements.pas
G 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/pscanner.pp
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r34569 into '.':
G .
--- Merging r34631 into '.':
G packages/fcl-passrc/src/pastree.pp
G packages/fcl-passrc/src/pasresolver.pp
G packages/fcl-passrc/src/pparser.pp
G packages/fcl-passrc/tests/tcresolver.pas
--- Recording mergeinfo for merge of r34631 into '.':
G .
--- Merging r34668 into '.':
G packages/fcl-passrc/src/pastree.pp
G packages/fcl-passrc/src/pparser.pp
G packages/fcl-passrc/tests/tctypeparser.pas
U packages/fcl-passrc/tests/tcprocfunc.pas
U packages/fcl-passrc/tests/testpassrc.lpi
G packages/fcl-passrc/tests/tcclasstype.pas
--- Recording mergeinfo for merge of r34668 into '.':
G .
--- Merging r34671 into '.':
G packages/fcl-passrc/src/pscanner.pp
G packages/fcl-passrc/src/pparser.pp
G packages/fcl-passrc/tests/tcclasstype.pas
U packages/fcl-passrc/tests/tcscanner.pas
U packages/fcl-passrc/tests/tcvarparser.pas
G packages/fcl-passrc/tests/testpassrc.lpi
--- Recording mergeinfo for merge of r34671 into '.':
G .
--- Merging r34672 into '.':
G packages/fcl-passrc/src/pparser.pp
G packages/fcl-passrc/tests/testpassrc.lpi
G packages/fcl-passrc/tests/tcstatements.pas
G packages/fcl-passrc/tests/tctypeparser.pas
--- Recording mergeinfo for merge of r34672 into '.':
G .
--- Merging r34674 into '.':
G packages/fcl-passrc/tests/testpassrc.lpi
G packages/fcl-passrc/tests/tctypeparser.pas
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r34674 into '.':
G .
--- Merging r34675 into '.':
G packages/fcl-passrc/tests/tctypeparser.pas
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r34675 into '.':
G .
--- Merging r34676 into '.':
U utils/fpdoc/makeskel.pp
--- Recording mergeinfo for merge of r34676 into '.':
G .
--- Merging r34687 into '.':
G packages/fcl-passrc/tests/tctypeparser.pas
G packages/fcl-passrc/tests/tcstatements.pas
G packages/fcl-passrc/src/pastree.pp
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r34687 into '.':
G .
--- Merging r34688 into '.':
G packages/fcl-passrc/src/pparser.pp
G packages/fcl-passrc/tests/tctypeparser.pas
--- Recording mergeinfo for merge of r34688 into '.':
G .
--- Merging r34689 into '.':
G packages/fcl-passrc/tests/tcprocfunc.pas
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r34689 into '.':
G .
--- Merging r34690 into '.':
G packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r34690 into '.':
G .
--- Merging r34691 into '.':
G packages/fcl-passrc/src/pparser.pp
G packages/fcl-passrc/tests/tcexprparser.pas
--- Recording mergeinfo for merge of r34691 into '.':
G .
--- Merging r34694 into '.':
G utils/fpdoc/makeskel.pp
--- Recording mergeinfo for merge of r34694 into '.':
G .
--- Merging r34699 into '.':
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r34699 into '.':
G .
--- Merging r34700 into '.':
G packages/fcl-passrc/src/pastree.pp
--- Recording mergeinfo for merge of r34700 into '.':
G .
--- Merging r34709 into '.':
G packages/fcl-passrc/tests/testpassrc.lpi
G 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/pscanner.pp
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r34709 into '.':
G .
--- Merging r34716 into '.':
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 r34716 into '.':
G .
--- Merging r34739 into '.':
U packages/fcl-passrc/src/readme.txt
--- Recording mergeinfo for merge of r34739 into '.':
G .
--- Merging r34749 into '.':
U utils/fpdoc/fpdocxmlopts.pas
U utils/fpdoc/mkfpdoc.pp
U utils/fpdoc/dglobals.pp
U utils/fpdoc/fpdoc.pp
--- Recording mergeinfo for merge of r34749 into '.':
G .
--- Merging r34750 into '.':
G packages/fcl-passrc/tests/tcprocfunc.pas
G packages/fcl-passrc/src/pastree.pp
--- Recording mergeinfo for merge of r34750 into '.':
G .
--- Merging r34751 into '.':
G packages/fcl-passrc/src/pastree.pp
--- Recording mergeinfo for merge of r34751 into '.':
G .
--- Merging r34752 into '.':
U utils/fpdoc/dwlinear.pp
U utils/fpdoc/dw_ipflin.pas
--- Recording mergeinfo for merge of r34752 into '.':
G .
--- Merging r34753 into '.':
G packages/fcl-passrc/tests/tcscanner.pas
G packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r34753 into '.':
G .
--- Merging r34754 into '.':
G packages/fcl-passrc/src/pscanner.pp
G packages/fcl-passrc/src/pparser.pp
G packages/fcl-passrc/src/pastree.pp
G packages/fcl-passrc/tests/tcscanner.pas
G packages/fcl-passrc/tests/tcbaseparser.pas
G packages/fcl-passrc/tests/tcclasstype.pas
--- Recording mergeinfo for merge of r34754 into '.':
G .
--- Merging r34756 into '.':
G packages/fcl-passrc/tests/tcscanner.pas
G packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r34756 into '.':
G .
--- Merging r34759 into '.':
G packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r34759 into '.':
G .
# revisions: 34555,34569,34631,34668,34671,34672,34674,34675,34676,34687,34688,34689,34690,34691,34694,34699,34700,34709,34716,34739,34749,34750,34751,34752,34753,34754,34756,34759
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@35978 3ad0048d-3df7-0310-abae-a5850022a9f2
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
U packages/pastojs/tests/tcconverter.pp
U packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r34430 into '.':
U .
--- Merging r34466 into '.':
U packages/fcl-web/src/base/custfcgi.pp
--- Recording mergeinfo for merge of r34466 into '.':
G .
--- Merging r34470 into '.':
U packages/fcl-web/src/base/httpdefs.pp
--- Recording mergeinfo for merge of r34470 into '.':
G .
--- Merging r34520 into '.':
G packages/pastojs/src/fppas2js.pp
G packages/pastojs/tests/tcconverter.pp
U packages/pastojs/tests/testpas2js.pp
A packages/pastojs/tests/tcmodules.pas
U packages/fcl-js/tests/testjs.lpr
U packages/fcl-js/tests/tcwriter.pp
U packages/fcl-js/src/jswriter.pp
U packages/fcl-js/src/jstree.pp
U packages/fcl-passrc/tests/tctypeparser.pas
U packages/fcl-passrc/tests/tcresolver.pas
U packages/fcl-passrc/src/pastree.pp
U packages/fcl-passrc/src/pasresolver.pp
U packages/fcl-passrc/src/pscanner.pp
U packages/fcl-passrc/src/pparser.pp
U utils/fpdoc/dw_html.pp
--- Recording mergeinfo for merge of r34520 into '.':
G .
--- Merging r34535 into '.':
U packages/fcl-json/src/jsonscanner.pp
--- Recording mergeinfo for merge of r34535 into '.':
G .
--- Merging r34536 into '.':
U packages/fcl-json/tests/testjsonparser.pp
U packages/fcl-json/src/jsonparser.pp
--- Recording mergeinfo for merge of r34536 into '.':
G .
--- Merging r34537 into '.':
U packages/fcl-json/src/fpjson.pp
--- Recording mergeinfo for merge of r34537 into '.':
G .
--- Merging r34538 into '.':
U packages/fcl-json/tests/testjsondata.pp
G packages/fcl-json/tests/testjsonparser.pp
U packages/fcl-json/tests/testjsonrtti.pp
U packages/fcl-json/src/fpjsonrtti.pp
G packages/fcl-json/src/jsonscanner.pp
G packages/fcl-json/src/jsonparser.pp
--- Recording mergeinfo for merge of r34538 into '.':
G .
--- Merging r34651 into '.':
U packages/fcl-js/src/jsbase.pp
U packages/fcl-js/src/jsparser.pp
G packages/fcl-js/src/jswriter.pp
G packages/fcl-js/src/jstree.pp
U packages/fcl-js/src/jstoken.pp
--- Recording mergeinfo for merge of r34651 into '.':
G .
--- Merging r34652 into '.':
A packages/fcl-js/src/jsminifier.pp
A packages/fcl-js/examples
A packages/fcl-js/examples/fpjsmin.pp
U packages/fcl-js/fpmake.pp
--- Recording mergeinfo for merge of r34652 into '.':
G .
--- Merging r34654 into '.':
G packages/fcl-js/fpmake.pp
--- Recording mergeinfo for merge of r34654 into '.':
G .
# revisions: 34430,34466,34470,34520,34535,34536,34537,34538,34651,34652,34654
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@35977 3ad0048d-3df7-0310-abae-a5850022a9f2
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
U utils/fpdoc/fpdocclasstree.pp
U utils/fpdoc/dglobals.pp
U utils/fpdoc/fpclasschart.pp
--- Recording mergeinfo for merge of r31366 into '.':
U .
--- Merging r31367 into '.':
G utils/fpdoc/fpclasschart.pp
G utils/fpdoc/fpdocclasstree.pp
--- Recording mergeinfo for merge of r31367 into '.':
G .
--- Merging r32183 into '.':
U packages/fcl-passrc/tests/tcstatements.pas
U packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r32183 into '.':
G .
--- Merging r32360 into '.':
U utils/fpdoc/fpdoc.css
U utils/fpdoc/css.inc
--- Recording mergeinfo for merge of r32360 into '.':
G .
--- Merging r32374 into '.':
U utils/fpdoc/dw_html.pp
U utils/fpdoc/mkfpdoc.pp
G utils/fpdoc/dglobals.pp
U utils/fpdoc/fpdoc.pp
--- Recording mergeinfo for merge of r32374 into '.':
G .
--- Merging r32376 into '.':
A utils/fpdoc/examples
A utils/fpdoc/examples/gentest.sh
A utils/fpdoc/examples/project
A utils/fpdoc/examples/project/sample-project.xml
A utils/fpdoc/examples/project/readme.txt
A utils/fpdoc/examples/basedir
A utils/fpdoc/examples/basedir/readme.txt
A utils/fpdoc/examples/basedir/sample-project.xml
A utils/fpdoc/examples/simple
A utils/fpdoc/examples/simple/testunit.xml
A utils/fpdoc/examples/simple/html.bat
A utils/fpdoc/examples/simple/readme.txt
A utils/fpdoc/examples/simple/html.sh
A utils/fpdoc/examples/simple/testunit.pp
D utils/fpdoc/testunit.pp
D utils/fpdoc/testunit.xml
D utils/fpdoc/gentest.sh
--- Recording mergeinfo for merge of r32376 into '.':
G .
--- Recording mergeinfo for merge of r34113 into '.':
G .
--- Merging r34114 into '.':
U packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r34114 into '.':
G .
--- Merging r34132 into '.':
G packages/fcl-passrc/src/pscanner.pp
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r34132 into '.':
G .
--- Merging r34169 into '.':
G packages/fcl-passrc/src/pscanner.pp
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r34169 into '.':
G .
# revisions: 31366,31367,32183,32360,32374,32376,34113,34114,34132,34169
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@35971 3ad0048d-3df7-0310-abae-a5850022a9f2
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
U utils/fpdoc/fpclasschart.pp
C utils/fpdoc/fpdocclasstree.pp
U utils/fpdoc/dglobals.pp
--- Recording mergeinfo for merge of r31365 into '.':
U .
Summary of conflicts:
Text conflicts: 1
# revisions: 31365
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@35969 3ad0048d-3df7-0310-abae-a5850022a9f2
|
| |
|
|
| |
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@35824 3ad0048d-3df7-0310-abae-a5850022a9f2
|
| |
|
|
| |
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@35434 3ad0048d-3df7-0310-abae-a5850022a9f2
|
| |
|
|
| |
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@35247 3ad0048d-3df7-0310-abae-a5850022a9f2
|
| |
|
|
| |
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@35246 3ad0048d-3df7-0310-abae-a5850022a9f2
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* pas2jni: Explicitly release JNI local refs while executing method pointers.
........
* pas2jni: Fixed string constant handling after recent changes in FPC.
........
* pas2jni: Fixed invoking of Java event handlers from non-main threads.
........
* pas2jni: Fixed handling of identical names of classes, proctypes when they are defined in different units.
........
* pas2jni: Removed option to create event handler by passing Java method method name as a string. It is not safe, since the target method is treated as unused by Java and the method may be removed from the resulting application.
........
* pas2jni: Reverted r34367 and mark undesired event handler creation "deprecated".
........
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@34774 3ad0048d-3df7-0310-abae-a5850022a9f2
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@33883 3ad0048d-3df7-0310-abae-a5850022a9f2
|
| |
|
|
|
|
|
|
|
|
|
|
| |
U utils/tply/lextable.pas
U utils/tply/plex.pas
--- Recording mergeinfo for merge of r32264 into '.':
G .
# revisions: 32264
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@33789 3ad0048d-3df7-0310-abae-a5850022a9f2
|
| |
|
|
| |
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@33786 3ad0048d-3df7-0310-abae-a5850022a9f2
|
| |
|
|
| |
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@33752 3ad0048d-3df7-0310-abae-a5850022a9f2
|
| |
|
|
|
|
| |
32896,32897,32985,32988,32044,33061,33151,33170,33194,33206,33207,33220,33221,33226,33237,33241,33265
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@33749 3ad0048d-3df7-0310-abae-a5850022a9f2
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
U packages/hash/src/md5.pp
--- Recording mergeinfo for merge of r32795 into '.':
U .
--- Merging r32804 into '.':
U packages/openssl/src/openssl.pas
--- Recording mergeinfo for merge of r32804 into '.':
G .
--- Merging r32805 into '.':
U packages/openssl/examples/test1.pas
--- Recording mergeinfo for merge of r32805 into '.':
G .
--- Merging r32806 into '.':
U packages/fcl-fpcunit/src/demo/consolerunner/testrunner.pp
U packages/fcl-fpcunit/src/fpcunit.pp
--- Recording mergeinfo for merge of r32806 into '.':
G .
--- Merging r32809 into '.':
U utils/fpdoc/fpdoc.pp
--- Recording mergeinfo for merge of r32809 into '.':
G .
--- Merging r32814 into '.':
U packages/rtl-unicode/src/collations/collation_zh_be.inc
U packages/rtl-unicode/src/collations/collation_es_le.inc
U packages/rtl-unicode/src/collations/collation_ko_le.inc
U packages/rtl-unicode/src/collations/collation_zh.pas
U packages/rtl-unicode/src/collations/collation_ru_be.inc
U packages/rtl-unicode/src/collations/collation_sv_be.inc
U packages/rtl-unicode/src/collations/collation_ja_be.inc
U packages/rtl-unicode/src/collations/collation_ru.pas
U packages/rtl-unicode/src/collations/collation_zh_le.inc
U packages/rtl-unicode/src/collations/collation_de.pas
U packages/rtl-unicode/src/collations/collation_sv.pas
U packages/rtl-unicode/src/collations/collation_ja.pas
U packages/rtl-unicode/src/collations/collation_ru_le.inc
U packages/rtl-unicode/src/collations/collation_sv_le.inc
U packages/rtl-unicode/src/collations/collation_ja_le.inc
U packages/rtl-unicode/src/collations/collation_es_be.inc
U packages/rtl-unicode/src/collations/collation_ko_be.inc
U packages/rtl-unicode/src/collations/collation_es.pas
U packages/rtl-unicode/src/collations/collation_ko.pas
U packages/rtl-unicode/src/collations/collation_fr_ca.pas
U packages/rtl-unicode/src/inc/ucadata.inc
U packages/rtl-unicode/src/inc/ucadata_le.inc
U packages/rtl-unicode/src/inc/ucadata_be.inc
--- Recording mergeinfo for merge of r32814 into '.':
G .
--- Merging r32820 into '.':
U packages/winunits-jedi/src/jwaactivex.pas
U rtl/objpas/types.pp
U rtl/objpas/classes/classesh.inc
U rtl/objpas/classes/streams.inc
--- Recording mergeinfo for merge of r32820 into '.':
G .
--- Merging r32826 into '.':
U packages/fcl-process/src/process.pp
--- Recording mergeinfo for merge of r32826 into '.':
G .
--- Merging r32860 into '.':
U packages/paszlib/examples/miniunz.pas
--- Recording mergeinfo for merge of r32860 into '.':
G .
--- Merging r32861 into '.':
U packages/paszlib/src/zipper.pp
--- Recording mergeinfo for merge of r32861 into '.':
G .
--- Merging r32862 into '.':
A packages/paszlib/examples/fpzipper.lpi
A packages/paszlib/examples/fpunzipper.lpi
A packages/paszlib/examples/fpzipper.lpr
A packages/paszlib/examples/fpunzipper.lpr
--- Recording mergeinfo for merge of r32862 into '.':
G .
--- Merging r32868 into '.':
U packages/fcl-fpcunit/src/consoletestrunner.pas
--- Recording mergeinfo for merge of r32868 into '.':
G .
--- Merging r32891 into '.':
A packages/fcl-process/examples
A packages/fcl-process/examples/demoproject.ico
A packages/fcl-process/examples/demoproject.pp
A packages/fcl-process/examples/demoproject.lpi
A packages/fcl-process/examples/echoparams.pp
A packages/fcl-process/examples/demoproject.res
--- Recording mergeinfo for merge of r32891 into '.':
G .
--- Merging r32892 into '.':
A packages/fcl-process/examples/demoruncommand.lpi
A packages/fcl-process/examples/demoruncommand.pp
--- Recording mergeinfo for merge of r32892 into '.':
G .
--- Merging r32893 into '.':
G packages/fcl-process/src/process.pp
--- Recording mergeinfo for merge of r32893 into '.':
G .
--- Merging r32895 into '.':
G utils/fpdoc/fpdoc.pp
--- Recording mergeinfo for merge of r32895 into '.':
G .
# revisions: 32795,32804,32805,32806,32809,32814,32820,32826,32860,32861,32862,32868,32891,32892,32893,32895
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@33748 3ad0048d-3df7-0310-abae-a5850022a9f2
|
| |
|
|
| |
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@33747 3ad0048d-3df7-0310-abae-a5850022a9f2
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
U compiler/cgobj.pas
--- Recording mergeinfo for merge of r29821 into '.':
U .
--- Merging r30947 into '.':
C compiler/nmem.pas
U compiler/jvm/njvmmem.pas
C compiler/objcutil.pas
--- Recording mergeinfo for merge of r30947 into '.':
G .
--- Merging r31202 into '.':
U compiler/utils/gppc386.pp
--- Recording mergeinfo for merge of r31202 into '.':
G .
--- Merging r31245 into '.':
U compiler/symtype.pas
U compiler/symdef.pas
--- Recording mergeinfo for merge of r31245 into '.':
G .
--- Merging r31289 into '.':
U rtl/inc/aliases.inc
--- Recording mergeinfo for merge of r31289 into '.':
G .
--- Merging r31447 into '.':
U compiler/aasmtai.pas
--- Recording mergeinfo for merge of r31447 into '.':
G .
--- Merging r31457 into '.':
C compiler/msgtxt.inc
U compiler/msg/errore.msg
C compiler/msgidx.inc
--- Recording mergeinfo for merge of r31457 into '.':
G .
--- Merging r31909 into '.':
U utils/rstconv.pp
--- Recording mergeinfo for merge of r31909 into '.':
G .
--- Merging r32087 into '.':
U tests/webtbs/tw22376.pp
--- Recording mergeinfo for merge of r32087 into '.':
G .
--- Merging r32412 into '.':
G compiler/symtype.pas
G compiler/symdef.pas
--- Recording mergeinfo for merge of r32412 into '.':
G .
--- Merging r32516 into '.':
U compiler/ncgmem.pas
A tests/webtbs/tw29064.pp
--- Recording mergeinfo for merge of r32516 into '.':
G .
--- Merging r32548 into '.':
U tests/Makefile
A tests/createlst.mak
U tests/utils/gparmake.pp
U tests/Makefile.fpc
--- Recording mergeinfo for merge of r32548 into '.':
G .
--- Merging r32593 into '.':
U compiler/pparautl.pas
--- Recording mergeinfo for merge of r32593 into '.':
G .
--- Merging r32617 into '.':
U compiler/symsym.pas
C compiler/ppu.pas
U compiler/utils/ppuutils/ppudump.pp
A tests/webtbs/uw28964.pp
A tests/webtbs/tw28964.pp
--- Recording mergeinfo for merge of r32617 into '.':
G .
--- Merging r32619 into '.':
U compiler/nmat.pas
A tests/webtbs/tw28702.pp
--- Recording mergeinfo for merge of r32619 into '.':
G .
--- Merging r32627 into '.':
U rtl/inc/ustrings.inc
--- Recording mergeinfo for merge of r32627 into '.':
G .
--- Merging r32632 into '.':
G compiler/symsym.pas
--- Recording mergeinfo for merge of r32632 into '.':
G .
--- Merging r32633 into '.':
G compiler/cgobj.pas
--- Recording mergeinfo for merge of r32633 into '.':
G .
--- Merging r32634 into '.':
U compiler/powerpc/cpupara.pas
--- Recording mergeinfo for merge of r32634 into '.':
G .
--- Merging r32636 into '.':
A tests/webtbs/tw29153.pp
U compiler/ngtcon.pas
--- Recording mergeinfo for merge of r32636 into '.':
G .
--- Merging r32745 into '.':
G compiler/pparautl.pas
U compiler/ncal.pas
--- Recording mergeinfo for merge of r32745 into '.':
G .
--- Merging r32781 into '.':
G compiler/symdef.pas
--- Recording mergeinfo for merge of r32781 into '.':
G .
--- Merging r33004 into '.':
U packages/rtl-extra/src/unix/ipc.pp
--- Recording mergeinfo for merge of r33004 into '.':
G .
--- Merging r33112 into '.':
G compiler/nmem.pas
--- Recording mergeinfo for merge of r33112 into '.':
G .
--- Merging r33157 into '.':
U rtl/java/justrings.inc
--- Recording mergeinfo for merge of r33157 into '.':
G .
--- Merging r33161 into '.':
G rtl/java/justrings.inc
--- Recording mergeinfo for merge of r33161 into '.':
G .
--- Merging r33167 into '.':
U packages/numlib/tests/invgente.pas
U packages/numlib/tests/sleglste.pas
U packages/numlib/tests/eiggg1te.pas
U packages/numlib/tests/roof1rte.pas
U packages/numlib/tests/roopolte.pas
U packages/numlib/tests/eigbs3te.pas
U packages/numlib/tests/slegente.pas
U packages/numlib/tests/eiggs3te.pas
U packages/numlib/tests/spege1te.pas
U packages/numlib/tests/invgpdte.pas
U packages/numlib/tests/spemaxte.pas
U packages/numlib/tests/eigts3te.pas
U packages/numlib/tests/detgsyte.pas
U packages/numlib/tests/slegbalt.pas
U packages/numlib/tests/detgpbte.pas
U packages/numlib/tests/slegsylt.pas
U packages/numlib/tests/slegpdte.pas
U packages/numlib/tests/slegpblt.pas
U packages/numlib/tests/odeiv2te.pas
U packages/numlib/tests/intge3te.pas
U packages/numlib/tests/sledtrte.pas
U packages/numlib/tests/eigsv1te.pas
U packages/numlib/tests/slegtrte.pas
U packages/numlib/tests/eigge1te.pas
U packages/numlib/tests/eiggg4te.pas
U packages/numlib/tests/eigbs2te.pas
U packages/numlib/tests/eiggs2te.pas
U packages/numlib/tests/timer.pas
U packages/numlib/tests/eigts2te.pas
U packages/numlib/tests/spepolte.pas
U packages/numlib/tests/roofnrt1.pas
U packages/numlib/tests/test.pas
U packages/numlib/tests/odeiv1te.pas
U packages/numlib/tests/intge2te.pas
U packages/numlib/tests/speentte.pas
U packages/numlib/tests/sleglslt.pas
U packages/numlib/tests/eiggg3te.pas
U packages/numlib/tests/eigbs1te.pas
U packages/numlib/tests/turte.pas
U packages/numlib/tests/invgsyte.pas
U packages/numlib/tests/eiggs1te.pas
U packages/numlib/tests/slegenlt.pas
U packages/numlib/tests/eigts1te.pas
U packages/numlib/tests/slegbate.pas
U packages/numlib/tests/roofnrte.pas
U packages/numlib/tests/slegsyte.pas
U packages/numlib/tests/detgpdte.pas
U packages/numlib/tests/slegpbte.pas
U packages/numlib/tests/spepowte.pas
U packages/numlib/tests/slegpdlt.pas
U packages/numlib/tests/intge1te.pas
U packages/numlib/tests/detgtrte.pas
U packages/numlib/tests/eigsv3te.pas
U packages/numlib/tests/eigge3te.pas
U packages/numlib/tests/eiggg2te.pas
U packages/numlib/tests/iomwrmte.pas
U packages/numlib/tests/eigbs4te.pas
U packages/numlib/tests/eiggs4te.pas
U packages/numlib/tests/spesgnte.pas
U packages/numlib/tests/eigts4te.pas
--- Recording mergeinfo for merge of r33167 into '.':
G .
--- Merging r33191 into '.':
U compiler/cutils.pas
A tests/webtbs/tw29620.pp
--- Recording mergeinfo for merge of r33191 into '.':
G .
--- Merging r33193 into '.':
U compiler/symtable.pas
--- Recording mergeinfo for merge of r33193 into '.':
G .
--- Merging r33202 into '.':
U compiler/options.pas
--- Recording mergeinfo for merge of r33202 into '.':
G .
--- Merging r33203 into '.':
U rtl/inc/flt_core.inc
--- Recording mergeinfo for merge of r33203 into '.':
G .
--- Merging r33268 into '.':
U compiler/pinline.pas
A tests/test/tw29833.pp
--- Recording mergeinfo for merge of r33268 into '.':
G .
--- Merging r33270 into '.':
U tests/test/units/sysutils/tfexpand2.pp
U tests/test/units/system/tdir2.pp
--- Recording mergeinfo for merge of r33270 into '.':
G .
--- Merging r33271 into '.':
U rtl/objpas/sysutils/sysuni.inc
A tests/test/units/sysutils/twstralloc.pp
--- Recording mergeinfo for merge of r33271 into '.':
G .
--- Merging r33382 into '.':
A tests/webtbs/tw29923.pp
G compiler/cgobj.pas
--- Recording mergeinfo for merge of r33382 into '.':
G .
--- Merging r33413 into '.':
C compiler/ncnv.pas
A tests/webtbs/tw29930.pp
--- Recording mergeinfo for merge of r33413 into '.':
G .
--- Merging r33480 into '.':
U compiler/pdecsub.pas
A tests/webtbs/tw29992.pp
--- Recording mergeinfo for merge of r33480 into '.':
G .
--- Merging r33536 into '.':
U compiler/systems.pas
--- Recording mergeinfo for merge of r33536 into '.':
G .
--- Merging r33539 into '.':
U compiler/powerpc/nppcadd.pas
A tests/webtbs/tw30035a.pp
A tests/webtbs/tw30035.pp
--- Recording mergeinfo for merge of r33539 into '.':
G .
--- Merging r33567 into '.':
U rtl/jvm/jvm.inc
--- Recording mergeinfo for merge of r33567 into '.':
G .
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@33584 3ad0048d-3df7-0310-abae-a5850022a9f2
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
U packages/fcl-image/src/fpreadtiff.pas
--- Recording mergeinfo for merge of r31942 into '.':
U .
--- Merging r32813 into '.':
U packages/fcl-image/src/fpwritepng.pp
--- Recording mergeinfo for merge of r32813 into '.':
G .
--- Merging r33464 into '.':
U packages/fcl-image/src/fpimage.inc
--- Recording mergeinfo for merge of r33464 into '.':
G .
--- Merging r33465 into '.':
U packages/fcl-image/src/fpreadjpeg.pas
--- Recording mergeinfo for merge of r33465 into '.':
G .
--- Merging r33466 into '.':
U packages/fcl-image/src/fphandler.inc
--- Recording mergeinfo for merge of r33466 into '.':
G .
--- Merging r33467 into '.':
G packages/fcl-image/src/fpimage.inc
--- Recording mergeinfo for merge of r33467 into '.':
G .
--- Merging r33471 into '.':
G packages/fcl-image/src/fphandler.inc
G packages/fcl-image/src/fpreadjpeg.pas
G packages/fcl-image/src/fpimage.inc
--- Recording mergeinfo for merge of r33471 into '.':
G .
--- Merging r33472 into '.':
U packages/fcl-image/src/fpreadpng.pp
--- Recording mergeinfo for merge of r33472 into '.':
G .
--- Merging r33473 into '.':
G packages/fcl-image/src/fpimage.inc
U packages/fcl-image/src/fpimage.pp
U packages/fcl-image/src/fphandler.inc
--- Recording mergeinfo for merge of r33473 into '.':
G .
--- Merging r33474 into '.':
G packages/fcl-image/src/fpimage.pp
G packages/fcl-image/src/fpreadjpeg.pas
G packages/fcl-image/src/fphandler.inc
--- Recording mergeinfo for merge of r33474 into '.':
G .
# revisions: 31942,32813,33464,33465,33466,33467,33471,33472,33473,33474
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@33580 3ad0048d-3df7-0310-abae-a5850022a9f2
|
| |
|
|
|
|
|
|
|
|
| |
* pas2jni: Fixed exit code.
........
* pas2jni: Minor fix to exe extension.
........
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@33437 3ad0048d-3df7-0310-abae-a5850022a9f2
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
C utils/fpcm/fpcmmain.pp
--- Recording mergeinfo for merge of r30250 into '.':
U .
Summary of conflicts:
Text conflicts: 1
# revisions: 30250
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@33425 3ad0048d-3df7-0310-abae-a5850022a9f2
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
U .
--- Recording mergeinfo for merge of r29429 into '.':
U .
--- Recording mergeinfo for merge of r31463 into '.':
U .
--- Merging r32084 into '.':
U utils/pas2jni/ppuparser.pas
--- Recording mergeinfo for merge of r32084 into '.':
U .
--- Merging r32539 into '.':
U utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r32539 into '.':
G .
--- Merging r32560 into '.':
G utils/pas2jni/ppuparser.pas
G utils/pas2jni/writer.pas
U utils/pas2jni/def.pas
--- Recording mergeinfo for merge of r32560 into '.':
G .
--- Merging r32561 into '.':
G utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r32561 into '.':
G .
--- Merging r32563 into '.':
G utils/pas2jni/writer.pas
G utils/pas2jni/ppuparser.pas
--- Recording mergeinfo for merge of r32563 into '.':
G .
--- Merging r32578 into '.':
G utils/pas2jni/writer.pas
G utils/pas2jni/def.pas
G utils/pas2jni/ppuparser.pas
--- Recording mergeinfo for merge of r32578 into '.':
G .
--- Merging r32607 into '.':
G utils/pas2jni/writer.pas
G utils/pas2jni/def.pas
G utils/pas2jni/ppuparser.pas
--- Recording mergeinfo for merge of r32607 into '.':
G .
--- Merging r32609 into '.':
G utils/pas2jni/writer.pas
G utils/pas2jni/ppuparser.pas
--- Recording mergeinfo for merge of r32609 into '.':
G .
--- Merging r32611 into '.':
G utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r32611 into '.':
G .
--- Merging r32612 into '.':
G utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r32612 into '.':
G .
--- Merging r32615 into '.':
G utils/pas2jni/writer.pas
G utils/pas2jni/def.pas
G utils/pas2jni/ppuparser.pas
--- Recording mergeinfo for merge of r32615 into '.':
G .
--- Merging r32616 into '.':
G utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r32616 into '.':
G .
--- Merging r32620 into '.':
G utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r32620 into '.':
G .
--- Merging r32669 into '.':
G utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r32669 into '.':
G .
--- Merging r32733 into '.':
G utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r32733 into '.':
G .
--- Merging r32744 into '.':
G utils/pas2jni/ppuparser.pas
U utils/pas2jni/pas2jni.pas
--- Recording mergeinfo for merge of r32744 into '.':
G .
--- Merging r32747 into '.':
G utils/pas2jni/ppuparser.pas
--- Recording mergeinfo for merge of r32747 into '.':
G .
--- Merging r33005 into '.':
G utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r33005 into '.':
G .
--- Merging r33072 into '.':
G utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r33072 into '.':
G .
--- Merging r33083 into '.':
G utils/pas2jni/def.pas
G utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r33083 into '.':
G .
# revisions: 29419,29429,31463,32084,32539,32560,32561,32563,32578,32607,32609,32611,32612,32615,32616,32620,32669,32733,32744,32747,33005,33072,33083
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@33400 3ad0048d-3df7-0310-abae-a5850022a9f2
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
U packages/fppkg/src/pkgmessages.pp
U packages/fppkg/src/pkgcommands.pp
U utils/fppkg/fppkg.pp
--- Recording mergeinfo for merge of r32224 into '.':
U .
# revisions: 3222
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@32273 3ad0048d-3df7-0310-abae-a5850022a9f2
|
| |
|
|
|
|
|
|
|
|
|
| |
U utils/fppkg/fppkg.pp
--- Recording mergeinfo for merge of r32071 into '.':
U .
# revisions: 32071
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@32238 3ad0048d-3df7-0310-abae-a5850022a9f2
|
| |
|
|
|
|
|
|
| |
* pas2jni: Fixed reading of the ppudump's output in some cases.
........
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@32085 3ad0048d-3df7-0310-abae-a5850022a9f2
|
| |
|
|
| |
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@32002 3ad0048d-3df7-0310-abae-a5850022a9f2
|
| |
|
|
| |
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@31970 3ad0048d-3df7-0310-abae-a5850022a9f2
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@31969 3ad0048d-3df7-0310-abae-a5850022a9f2
|
| |
|
|
|
|
|
|
|
|
|
| |
U utils/fpmake.pp
--- Recording mergeinfo for merge of r31316 into '.':
U .
# revisions: 31316
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@31968 3ad0048d-3df7-0310-abae-a5850022a9f2
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
U compiler/widestr.pas
--- Merging (from foreign repository) r31881 into '.':
G compiler/widestr.pas
U compiler/cresstr.pas
U utils/rstconv.pp
# revisions: 31878, 31881
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@31964 3ad0048d-3df7-0310-abae-a5850022a9f2
|
| |
|
|
|
|
|
|
| |
* pas2jni: Fixed code generation in case of duplicate method names in a class hierarchy.
........
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@31918 3ad0048d-3df7-0310-abae-a5850022a9f2
|
| |
|
|
|
|
|
|
|
|
|
|
| |
U utils/fpcmkcfg/fpccfg.inc
U utils/fpcmkcfg/fpc.cft
--- Recording mergeinfo for merge of r31453 into '.':
U .
# revisions: 31453
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@31557 3ad0048d-3df7-0310-abae-a5850022a9f2
|
| |
|
|
|
|
|
|
|
|
|
|
| |
U utils/fpcmkcfg/fpccfg.inc
U utils/fpcmkcfg/fpc.cft
--- Recording mergeinfo for merge of r31372 into '.':
U .
# revisions: 31372
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@31556 3ad0048d-3df7-0310-abae-a5850022a9f2
|
| |
|
|
| |
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@31297 3ad0048d-3df7-0310-abae-a5850022a9f2
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
U packages/fcl-passrc/src/pparser.pp
U packages/fcl-passrc/src/pastree.pp
U packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r31168 into '.':
U .
--- Merging r31226 into '.':
U packages/fcl-passrc/tests/tctypeparser.pas
U packages/fcl-passrc/tests/tcprocfunc.pas
U packages/fcl-passrc/tests/testpassrc.lpi
U packages/fcl-passrc/tests/tcbaseparser.pas
G packages/fcl-passrc/src/pastree.pp
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r31226 into '.':
G .
--- Merging r31228 into '.':
G packages/fcl-passrc/src/pastree.pp
--- Recording mergeinfo for merge of r31228 into '.':
G .
--- Merging r31229 into '.':
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r31229 into '.':
G .
--- Merging r31230 into '.':
U utils/fpdoc/mkfpdoc.pp
--- Recording mergeinfo for merge of r31230 into '.':
G .
--- Merging r31231 into '.':
U utils/fpdoc/makeskel.pp
--- Recording mergeinfo for merge of r31231 into '.':
G .
--- Merging r31232 into '.':
U utils/fpdoc/dw_html.pp
--- Recording mergeinfo for merge of r31232 into '.':
G .
--- Merging r31233 into '.':
U utils/fpdoc/dglobals.pp
--- Recording mergeinfo for merge of r31233 into '.':
G .
--- Merging r31234 into '.':
U utils/fpdoc/testunit.pp
A utils/fpdoc/gentest.sh
U utils/fpdoc/testunit.xml
--- Recording mergeinfo for merge of r31234 into '.':
G .
# revisions: 31168,31226,31228,31229,31230,31231,31232,31233,31234
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@31269 3ad0048d-3df7-0310-abae-a5850022a9f2
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
U packages/Makefile
U packages/fpmkunit/src/fpmkunit.pp
U packages/Makefile.fpc
U utils/Makefile.fpc
U utils/Makefile
U ide/Makefile
U ide/Makefile.fpc
--- Recording mergeinfo for merge of r31166 into '.':
U .
# revisions: 31166
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@31204 3ad0048d-3df7-0310-abae-a5850022a9f2
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
U rtl/inc/system.fpd
--- Recording mergeinfo for merge of r31182 into '.':
U .
--- Merging r31183 into '.':
U packages/fcl-passrc/tests/testpassrc.lpi
U packages/fcl-passrc/src/pparser.pp
U packages/fcl-passrc/src/pastree.pp
--- Recording mergeinfo for merge of r31183 into '.':
G .
--- Merging r31184 into '.':
U utils/fpdoc/css.inc
U utils/fpdoc/dglobals.pp
U utils/fpdoc/testunit.xml
U utils/fpdoc/fpdoc.lpi
U utils/fpdoc/dw_ipflin.pas
U utils/fpdoc/testunit.pp
U utils/fpdoc/dw_linrtf.pp
U utils/fpdoc/dw_html.pp
U utils/fpdoc/fpdoc.css
U utils/fpdoc/dw_man.pp
U utils/fpdoc/dwlinear.pp
U utils/fpdoc/dw_latex.pp
U utils/fpdoc/dw_txt.pp
--- Recording mergeinfo for merge of r31184 into '.':
G .
# revisions: 31182,31183,31184
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@31203 3ad0048d-3df7-0310-abae-a5850022a9f2
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
U packages/chm/src/fasthtmlparser.pas
--- Recording mergeinfo for merge of r30258 into '.':
U .
--- Merging r30292 into '.':
U rtl/objpas/classes/streams.inc
--- Recording mergeinfo for merge of r30292 into '.':
G .
--- Merging r30327 into '.':
U packages/winunits-base/src/imm_dyn.pas
U packages/winunits-base/src/imm.pas
--- Recording mergeinfo for merge of r30327 into '.':
G .
--- Merging r30618 into '.':
U utils/fpmake.pp
--- Recording mergeinfo for merge of r30618 into '.':
G .
--- Merging r30621 into '.':
U rtl/linux/linux.pp
--- Recording mergeinfo for merge of r30621 into '.':
G .
--- Merging r30332 into '.':
U rtl/openbsd/ptypes.inc
--- Recording mergeinfo for merge of r30332 into '.':
G .
--- Merging r30333 into '.':
G rtl/openbsd/ptypes.inc
--- Recording mergeinfo for merge of r30333 into '.':
G .
--- Merging r30365 into '.':
U packages/regexpr/src/regexpr.pas
--- Recording mergeinfo for merge of r30365 into '.':
G .
# revisions: 30258,30292,30327,30618,30621,30332,30333,30365
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@31113 3ad0048d-3df7-0310-abae-a5850022a9f2
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
U rtl/android/dlandroid.inc
U rtl/win64/signals.pp
U rtl/win64/system.pp
A rtl/win64/buildrtl.lpi
U rtl/x86_64/cpu.pp
--- Recording mergeinfo for merge of r29422 through r29424 into '.':
U .
--- Merging r29438 into '.':
U packages/fpmkunit/src/fpmkunit.pp
--- Recording mergeinfo for merge of r29438 into '.':
G .
--- Merging r29439 into '.':
U packages/fppkg/src/pkgfpmake.pp
U packages/fppkg/src/pkgcommands.pp
U utils/fppkg/fppkg.pp
--- Recording mergeinfo for merge of r29439 into '.':
G .
--- Merging r29603 into '.':
U rtl/atari/Makefile.fpc
U rtl/atari/Makefile
--- Recording mergeinfo for merge of r29603 into '.':
G .
--- Merging r29604 into '.':
U rtl/Makefile.fpc
U rtl/Makefile
--- Recording mergeinfo for merge of r29604 into '.':
G .
--- Merging r29808 into '.':
U rtl/win/sysos.inc
--- Recording mergeinfo for merge of r29808 into '.':
G .
# revisions: 29422-29424,29438,29439,29603,29604,29808
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@31103 3ad0048d-3df7-0310-abae-a5850022a9f2
|
