U compiler/COPYING.txt
U packages/gtk2/src/glib/gparamspecs.inc
U packages/gtk2/src/gtk+/gdk/gdki18n.inc
U packages/gtk2/src/gtk+/gdk/gdkprivate.inc
U packages/gtk2/src/gtk+/gtk/gtkhsv.inc
U packages/gtk2/src/gtk+/gtk/gtkkeyhash.inc
U packages/gtk2/src/gtkext/gtkstatusiconh.inc
U packages/sdl/LGPL
U packages/googleapi/src/googlediscoverytopas.pp
U packages/googleapi/src/googlebase.pp
U packages/hermes/src/hermes_palette.inc
U packages/hermes/src/hermconf.inc
U packages/hermes/src/factconv.inc
U packages/hermes/src/p_32.inc
U packages/hermes/src/p_24.inc
U packages/hermes/src/p_16.inc
U packages/hermes/src/p_cnv.inc
U packages/hermes/src/p_g.inc
U packages/hermes/src/hermes_utility.inc
U packages/hermes/src/p_ga.inc
U packages/hermes/src/p_gca.inc
U packages/hermes/src/p_gac.inc
U packages/hermes/src/p_muhmu.inc
U packages/hermes/src/p_cpy.inc
U packages/hermes/src/hermdef.inc
U packages/hermes/src/hermes_converter.inc
U packages/hermes/src/hermes_factory.inc
U packages/hermes/src/p_gcc.inc
U packages/hermes/src/hermes_list.inc
U packages/hermes/src/hermes_clearer.inc
U packages/hermes/src/headp.inc
U packages/hermes/src/i386/mmxp2_32.inc
U packages/hermes/src/i386/x86_main.inc
U packages/hermes/src/i386/x86p_32.inc
U packages/hermes/src/i386/headi386.inc
U packages/hermes/src/i386/x86p_16.inc
U packages/hermes/src/i386/x86p_s32.inc
U packages/hermes/src/i386/x86p_cpy.inc
U packages/hermes/src/i386/mmx_clr.inc
U packages/hermes/src/i386/x8616lut.inc
U packages/hermes/src/i386/headmmx.inc
U packages/hermes/src/i386/x86pscpy.inc
U packages/hermes/src/i386/mmx_main.inc
U packages/hermes/src/i386/mmxp_32.inc
U packages/hermes/src/i386/x86_clr.inc
U packages/hermes/src/i386/x86p_i8.inc
U packages/hermes/src/hermes_dither.inc
U packages/hermes/src/x86_64/x86_64_i8.inc
U packages/hermes/src/d_32.inc
U packages/hermes/src/hermes_debug.inc
U packages/hermes/src/hermes.pp
U packages/hermes/src/hermes_format.inc
U packages/hermes/src/p_clr.inc
U packages/hermes/src/p_i8.inc
U packages/fcl-db/src/sqlite/customsqliteds.pas
U packages/fcl-db/src/sqlite/sqliteds.pas
U packages/fcl-db/src/sqlite/sqlite3ds.pas
U packages/fcl-db/src/sqldb/sqlite/sqlite3backup.pas
U packages/fcl-db/src/sqldb/postgres/pqeventmonitor.pp
U packages/fcl-db/src/sqldb/interbase/fbeventmonitor.pp
U packages/fcl-db/src/sqldb/interbase/fbadmin.pp
U packages/matroska/src/matroska.pas
U packages/ptc/src/win32/directx/win32directxcheck.inc
U packages/ptc/src/win32/directx/win32directxtranslate.inc
U packages/ptc/src/win32/directx/win32directxhook.inc
U packages/ptc/src/win32/directx/win32directxprimary.inc
U packages/ptc/src/win32/directx/win32directxhookd.inc
U packages/ptc/src/win32/directx/win32directxlibrary.inc
U packages/ptc/src/win32/directx/win32directxdisplay.inc
U packages/ptc/src/win32/directx/win32directxconsoled.inc
U packages/ptc/src/win32/directx/win32directxprimaryd.inc
U packages/ptc/src/win32/directx/win32directxlibraryd.inc
U packages/ptc/src/win32/directx/win32directxdisplayd.inc
U packages/ptc/src/win32/directx/win32directxconsolei.inc
U packages/ptc/src/win32/gdi/win32gdiconsolei.inc
U packages/ptc/src/win32/gdi/win32modesetterd.inc
U packages/ptc/src/win32/gdi/win32openglwindowd.inc
U packages/ptc/src/win32/gdi/win32dibd.inc
U packages/ptc/src/win32/gdi/win32modesetteri.inc
U packages/ptc/src/win32/gdi/win32openglwindowi.inc
U packages/ptc/src/win32/gdi/win32dibi.inc
U packages/ptc/src/win32/gdi/win32gdihookd.inc
U packages/ptc/src/win32/gdi/win32gdiconsoled.inc
U packages/ptc/src/win32/gdi/win32gdihooki.inc
U packages/ptc/src/win32/base/win32hook.inc
U packages/ptc/src/win32/base/win32kbd.inc
U packages/ptc/src/win32/base/win32mousei.inc
U packages/ptc/src/win32/base/win32hookd.inc
U packages/ptc/src/win32/base/win32kbdd.inc
U packages/ptc/src/win32/base/win32resized.inc
U packages/ptc/src/win32/base/win32window.inc
U packages/ptc/src/win32/base/win32resizei.inc
U packages/ptc/src/win32/base/win32windowd.inc
U packages/ptc/src/win32/base/win32cursor.inc
U packages/ptc/src/win32/base/win32event.inc
U packages/ptc/src/win32/base/win32cursord.inc
U packages/ptc/src/win32/base/win32eventd.inc
U packages/ptc/src/win32/base/win32cursormoded.inc
U packages/ptc/src/win32/base/win32monitor.inc
U packages/ptc/src/win32/base/win32monitord.inc
U packages/ptc/src/win32/base/win32moused.inc
U packages/ptc/src/cocoa/cocoaconsolei.inc
U packages/ptc/src/cocoa/cocoaconsoled.inc
U packages/ptc/src/ptc.pp
U packages/ptc/src/dos/textfx2/textfx2consoled.inc
U packages/ptc/src/dos/textfx2/textfx2consolei.inc
U packages/ptc/src/dos/base/mousei.inc
U packages/ptc/src/dos/base/kbdd.inc
U packages/ptc/src/dos/base/mouse33h.pp
U packages/ptc/src/dos/base/moused.inc
U packages/ptc/src/dos/base/kbd.inc
U packages/ptc/src/dos/cga/cga.pp
U packages/ptc/src/dos/cga/cgaconsoled.inc
U packages/ptc/src/dos/cga/cgaconsolei.inc
U packages/ptc/src/dos/vga/vgaconsolei.inc
U packages/ptc/src/dos/vga/vga.pp
U packages/ptc/src/dos/vga/vgaconsoled.inc
U packages/ptc/src/dos/timeunit/timeunit.pp
U packages/ptc/src/dos/vesa/vesaconsolei.inc
U packages/ptc/src/dos/vesa/vesa.pp
U packages/ptc/src/dos/vesa/vesaconsoled.inc
U packages/ptc/src/wince/gapi/wincegapiconsolei.inc
U packages/ptc/src/wince/gapi/wincegapiconsoled.inc
U packages/ptc/src/wince/gdi/wincebitmapinfoi.inc
U packages/ptc/src/wince/gdi/wincegdiconsoled.inc
U packages/ptc/src/wince/gdi/wincebitmapinfod.inc
U packages/ptc/src/wince/gdi/wincegdiconsolei.inc
U packages/ptc/src/wince/base/wincekeyboardi.inc
U packages/ptc/src/wince/base/wincewindowd.inc
U packages/ptc/src/wince/base/wincemoused.inc
U packages/ptc/src/wince/base/wincewindowi.inc
U packages/ptc/src/wince/base/wincemousei.inc
U packages/ptc/src/wince/base/wincekeyboardd.inc
U packages/ptc/src/ptcwrapper/ptcwrapper.pp
U packages/ptc/src/ptcwrapper/ptceventqueue.pp
U packages/ptc/src/core/closeeventd.inc
U packages/ptc/src/core/consolei.inc
U packages/ptc/src/core/resizeeventi.inc
U packages/ptc/src/core/closeeventi.inc
U packages/ptc/src/core/eventd.inc
U packages/ptc/src/core/moded.inc
U packages/ptc/src/core/eventi.inc
U packages/ptc/src/core/modei.inc
U packages/ptc/src/core/openglattributesd.inc
U packages/ptc/src/core/clipperd.inc
U packages/ptc/src/core/openglattributesi.inc
U packages/ptc/src/core/clipperi.inc
U packages/ptc/src/core/aread.inc
U packages/ptc/src/core/copyd.inc
U packages/ptc/src/core/log.inc
U packages/ptc/src/core/areai.inc
U packages/ptc/src/core/colord.inc
U packages/ptc/src/core/copyi.inc
U packages/ptc/src/core/timerd.inc
U packages/ptc/src/core/basesurfaced.inc
U packages/ptc/src/core/colori.inc
U packages/ptc/src/core/timeri.inc
U packages/ptc/src/core/cleard.inc
U packages/ptc/src/core/surfaced.inc
U packages/ptc/src/core/basesurfacei.inc
U packages/ptc/src/core/formatd.inc
U packages/ptc/src/core/errord.inc
U packages/ptc/src/core/mouseeventd.inc
U packages/ptc/src/core/keyeventd.inc
U packages/ptc/src/core/cleari.inc
U packages/ptc/src/core/surfacei.inc
U packages/ptc/src/core/baseconsoled.inc
U packages/ptc/src/core/formati.inc
U packages/ptc/src/core/paletted.inc
U packages/ptc/src/core/errori.inc
U packages/ptc/src/core/keyeventi.inc
U packages/ptc/src/core/mouseeventi.inc
U packages/ptc/src/core/baseconsolei.inc
U packages/ptc/src/core/consoled.inc
U packages/ptc/src/core/palettei.inc
U packages/ptc/src/core/resizeeventd.inc
U packages/ptc/src/x11/x11glxfbconfigd.inc
U packages/ptc/src/x11/x11windowdisplayd.inc
U packages/ptc/src/x11/x11glxfbconfigi.inc
U packages/ptc/src/x11/x11unikey.inc
U packages/ptc/src/x11/x11windowdisplayi.inc
U packages/ptc/src/x11/x11consoled.inc
U packages/ptc/src/x11/x11dga1displayd.inc
U packages/ptc/src/x11/x11dga2displayd.inc
U packages/ptc/src/x11/x11displayd.inc
U packages/ptc/src/x11/x11consolei.inc
U packages/ptc/src/x11/x11dga1displayi.inc
U packages/ptc/src/x11/x11modesd.inc
U packages/ptc/src/x11/x11dga2displayi.inc
U packages/ptc/src/x11/x11check.inc
U packages/ptc/src/x11/x11displayi.inc
U packages/ptc/src/x11/x11modesi.inc
U packages/ptc/src/x11/x11imaged.inc
U packages/ptc/src/x11/x11imagei.inc
U packages/ptc/src/c_api/capi_copyd.inc
U packages/ptc/src/c_api/capi_color.inc
U packages/ptc/src/c_api/capi_timer.inc
U packages/ptc/src/c_api/capi_colord.inc
U packages/ptc/src/c_api/capi_mode.inc
U packages/ptc/src/c_api/capi_timerd.inc
U packages/ptc/src/c_api/capi_clear.inc
U packages/ptc/src/c_api/capi_except.inc
U packages/ptc/src/c_api/capi_format.inc
U packages/ptc/src/c_api/capi_key.inc
U packages/ptc/src/c_api/capi_moded.inc
U packages/ptc/src/c_api/capi_surface.inc
U packages/ptc/src/c_api/capi_error.inc
U packages/ptc/src/c_api/capi_cleard.inc
U packages/ptc/src/c_api/capi_surfaced.inc
U packages/ptc/src/c_api/capi_keyd.inc
U packages/ptc/src/c_api/capi_formatd.inc
U packages/ptc/src/c_api/capi_exceptd.inc
U packages/ptc/src/c_api/capi_errord.inc
U packages/ptc/src/c_api/capi_palette.inc
U packages/ptc/src/c_api/capi_clipper.inc
U packages/ptc/src/c_api/capi_paletted.inc
U packages/ptc/src/c_api/capi_clipperd.inc
U packages/ptc/src/c_api/capi_console.inc
U packages/ptc/src/c_api/capi_consoled.inc
U packages/ptc/src/c_api/capi_index.inc
U packages/ptc/src/c_api/capi_area.inc
U packages/ptc/src/c_api/capi_copy.inc
U packages/ptc/src/c_api/capi_aread.inc
U packages/ptc/docs/lgpl.txt
U packages/fcl-base/src/csvdocument.pp
U packages/fcl-base/src/csvreadwrite.pp
U packages/winunits-base/src/eventsink.pp
U packages/winunits-base/src/typelib.pas
U packages/mysql/src/mysql4_com.pp
U packages/mysql/src/mysql.inc
U packages/mysql/src/mysql4_comdyn.pp
U packages/mysql/src/mysql4dyn.pp
U packages/chm/src/paslzxcomp.pas
U packages/aspell/LICENSE
U packages/os2units/src/dive.pas
U packages/bfd/src/bfd.pas
U utils/instantfpc/instantfpc.pas
U utils/fpdoc/COPYING.txt
U utils/fpdoc/README.txt
U utils/fppkg/lnet/LICENSE.ADDON
U utils/fppkg/lnet/lmimetypes.pp
U utils/fppkg/lnet/lhttputil.pp
U utils/fppkg/lnet/lprocess.pp
U utils/fppkg/lnet/lhttp.pp
U utils/fppkg/lnet/ltimer.pp
U utils/fppkg/lnet/lfastcgi.pp
U utils/fppkg/lnet/lspawnfcgi.pp
U utils/fppkg/lnet/lsmtp.pp
U utils/fppkg/lnet/lnet.pp
U utils/fppkg/lnet/lmimestreams.pp
U utils/fppkg/lnet/lmimewrapper.pp
U utils/fppkg/lnet/lcommon.pp
U utils/fppkg/lnet/LICENSE
U utils/fppkg/lnet/lftp.pp
U utils/fppkg/lnet/ltelnet.pp
U utils/fppkg/lnet/lstrbuffer.pp
U utils/fppkg/lnet/lwebserver.pp
U utils/fppkg/lnet/levents.pp
U utils/fppkg/lnet/lcontrolstack.pp
U rtl/sparc/setjumph.inc
U rtl/win/wininc/struct.inc
U rtl/win/wininc/unifun.inc
U rtl/win/wininc/ascdef.inc
U rtl/win/wininc/messages.inc
U rtl/win/wininc/base.inc
U rtl/win/wininc/unidef.inc
U rtl/win/wininc/func.inc
U rtl/win/wininc/errors.inc
U rtl/win/wininc/defines.inc
U rtl/win/wininc/ascfun.inc
U rtl/linux/powerpc/cprt0.as
U rtl/linux/arm/ucprt0.as
U rtl/linux/powerpc64/cprt0.as
U rtl/linux/powerpc64/gprt0.as
U rtl/linux/mips/cprt0.as
U rtl/os2/moncalls.pas
U rtl/os2/viocalls.pas
U rtl/os2/pmgpi.pas
U rtl/os2/moucalls.pas
U rtl/os2/kbdcalls.pas
U rtl/inc/flt_conv.inc
U rtl/inc/flt_core.inc
U rtl/wince/wininc/struct.inc
U rtl/wince/wininc/messages.inc
U rtl/wince/wininc/base.inc
U rtl/wince/wininc/errors.inc
U rtl/wince/wininc/defines.inc
U rtl/java/jsystem.inc
U rtl/COPYING.txt
U tests/test/units/sysutils/twstrcmp.pp
U tests/test/units/sysutils/tstrcmp.pp
U tests/test/units/sysutils/tastrcmp.pp
U tests/utils/avx/avxtestgenerator.pp
U tests/utils/avx/baselist.pas
U tests/utils/avx/asmtestgenerator.pas
U tests/utils/avx/options.pas
--- Recording mergeinfo for merge of r34598 into '.':
U .
--- Merging r35481 into '.':
U packages/graph/src/inc/gtext.inc
--- Recording mergeinfo for merge of r35481 into '.':
G .
--- Merging r36507 into '.':
G packages/ptc/src/dos/timeunit/timeunit.pp
D packages/ptc/src/dos/base/go32fix.pp
G packages/ptc/src/core/keyeventd.inc
G packages/ptc/src/core/mouseeventd.inc
G packages/ptc/src/core/baseconsoled.inc
G packages/ptc/src/core/errori.inc
G packages/ptc/src/core/baseconsolei.inc
G packages/ptc/src/core/consolei.inc
U packages/ptc/src/ptcpas.cfg
A packages/ptc/src/ptclaz.lpr
G packages/ptc/src/x11/x11consolei.inc
G packages/ptc/src/x11/x11dga1displayi.inc
G packages/ptc/src/x11/x11dga2displayi.inc
G packages/ptc/src/x11/x11displayi.inc
U packages/ptc/src/x11/x11extensions.inc
G packages/ptc/src/x11/x11windowdisplayd.inc
G packages/ptc/src/x11/x11unikey.inc
G packages/ptc/src/x11/x11windowdisplayi.inc
G packages/ptc/src/x11/x11consoled.inc
G packages/ptc/src/x11/x11dga1displayd.inc
G packages/ptc/src/x11/x11dga2displayd.inc
G packages/ptc/src/x11/x11displayd.inc
A packages/ptc/src/ptclaz.lpi
G packages/ptc/src/win32/base/win32moused.inc
G packages/ptc/src/win32/base/win32kbd.inc
G packages/ptc/src/win32/base/win32hook.inc
G packages/ptc/src/win32/base/win32mousei.inc
G packages/ptc/src/win32/base/win32kbdd.inc
G packages/ptc/src/win32/base/win32window.inc
G packages/ptc/src/win32/base/win32windowd.inc
U packages/ptc/src/win32/directx/p_ddraw.pp
G packages/ptc/src/win32/directx/win32directxhook.inc
A packages/ptc/src/win32/directx/p_dinput.pp
G packages/ptc/src/win32/directx/win32directxdisplay.inc
G packages/ptc/src/win32/directx/win32directxconsoled.inc
G packages/ptc/src/win32/directx/win32directxconsolei.inc
G packages/ptc/src/win32/gdi/win32gdiconsoled.inc
G packages/ptc/src/win32/gdi/win32gdiconsolei.inc
G packages/ptc/src/win32/gdi/win32openglwindowd.inc
G packages/ptc/src/win32/gdi/win32openglwindowi.inc
G packages/ptc/src/ptc.pp
U packages/ptc/docs/INSTALL.txt
U packages/ptc/docs/CHANGES.txt
U packages/ptc/docs/README.txt
U packages/ptc/examples/keyboard3.pp
U packages/ptc/fpmake.pp
A packages/ptc/tests/event.pp
U packages/graph/src/ptcgraph/ptcgraph.pp
--- Recording mergeinfo for merge of r36507 into '.':
G .
--- Merging r36508 into '.':
G packages/ptc/fpmake.pp
--- Recording mergeinfo for merge of r36508 into '.':
G .
--- Merging r36509 into '.':
U packages/ptc/src/dos/textfx2/textfx2.pp
G packages/ptc/src/dos/base/mouse33h.pp
G packages/ptc/src/dos/cga/cga.pp
G packages/ptc/src/dos/vga/vga.pp
G packages/ptc/src/dos/vesa/vesa.pp
--- Recording mergeinfo for merge of r36509 into '.':
G .
--- Merging r36555 into '.':
U packages/graph/src/ptcgraph/ptccrt.pp
G packages/ptc/src/core/keyeventd.inc
G packages/ptc/src/x11/x11displayi.inc
G packages/ptc/src/win32/base/win32kbd.inc
G packages/ptc/docs/CHANGES.txt
A packages/ptc/tests/crtkeys
A packages/ptc/tests/crtkeys/crtkeys_go32v2.txt
A packages/ptc/tests/crtkeys/crtkeys.pas
A packages/ptc/tests/crtkeys/crtkeys_tp7.txt
A packages/ptc/tests/crtkeys/ptccrtkeys.pas
A packages/ptc/tests/crtkeys/crtkeys_fpwincrt.txt
--- Recording mergeinfo for merge of r36555 into '.':
G .
--- Merging r36556 into '.':
G packages/graph/src/ptcgraph/ptccrt.pp
G packages/ptc/src/win32/base/win32kbd.inc
--- Recording mergeinfo for merge of r36556 into '.':
G .
# revisions: 34598,35481,36507,36508,36509,36555,36556
git-svn-id: branches/fixes_3_0@36558 -
U packages/ptc/src/dos/timeunit/timeunit.pp
--- Recording mergeinfo for merge of r35752 into '.':
U .
# revisions: 35752
git-svn-id: branches/fixes_3_0@36009 -
A packages/ptc/src/cocoa
A packages/ptc/src/cocoa/cocoaconsoled.inc
A packages/ptc/src/cocoa/cocoaconsolei.inc
U packages/ptc/src/ptc.pp
U packages/ptc/src/core/consolei.inc
U packages/ptc/src/core/keyeventd.inc
U packages/ptc/src/core/keyeventi.inc
U packages/ptc/src/x11/x11displayi.inc
U packages/ptc/src/x11/x11windowdisplayi.inc
U packages/ptc/docs/CHANGES.txt
U packages/ptc/docs/README.txt
--- Recording mergeinfo for merge of r33511 into '.':
U .
# revisions: 33511
git-svn-id: branches/fixes_3_0@33513 -
U packages/svgalib/fpmake.pp
U packages/libndsfpc/fpmake.pp
U packages/regexpr/fpmake.pp
U packages/libogcfpc/fpmake.pp
U packages/postgres/fpmake.pp
U packages/os2units/fpmake.pp
U packages/libxml/fpmake.pp
U packages/libcurl/fpmake.pp
U packages/gtk2/fpmake.pp
U packages/odbc/fpmake.pp
U packages/syslog/fpmake.pp
U packages/libgd/fpmake.pp
U packages/ibase/fpmake.pp
U packages/fpmkunit/src/fpmkunit.pp
U packages/opengles/fpmake.pp
U packages/fcl-base/fpmake.pp
U packages/gmp/fpmake.pp
U packages/uuid/fpmake.pp
U packages/libgbafpc/fpmake.pp
U packages/ptc/fpmake.pp
U ide/fpmake.pp
--- Recording mergeinfo for merge of r32142 into '.':
U .
# revisions: 32142
git-svn-id: branches/fixes_3_0@32242 -
C packages/googleapi
U packages/nvapi/Makefile.fpc
U packages/httpd13/Makefile.fpc
U packages/proj4/Makefile.fpc
U packages/odbc/Makefile.fpc
U packages/openssl/Makefile.fpc
U packages/rtl-unicode/Makefile.fpc
U packages/fcl-sdo/Makefile.fpc
U packages/libcurl/Makefile.fpc
U packages/gtk1/Makefile.fpc
U packages/libndsfpc/Makefile.fpc
U packages/paszlib/Makefile.fpc
U packages/cdrom/Makefile.fpc
U packages/chm/Makefile.fpc
U packages/fppkg/Makefile.fpc
U packages/x11/Makefile.fpc
U packages/regexpr/Makefile.fpc
U packages/zorba/Makefile.fpc
U packages/rtl-objpas/Makefile.fpc
U packages/ldap/Makefile.fpc
U packages/ncurses/Makefile.fpc
U packages/hash/Makefile.fpc
U packages/utmp/Makefile.fpc
U packages/numlib/Makefile.fpc
U packages/ami-extra/Makefile.fpc
U packages/fcl-net/Makefile.fpc
U packages/libogcfpc/Makefile.fpc
U packages/fcl-res/Makefile.fpc
U packages/imlib/Makefile.fpc
U packages/dbus/Makefile.fpc
U packages/imagemagick/Makefile.fpc
U packages/graph/Makefile.fpc
U packages/iosxlocale/Makefile.fpc
U packages/unzip/Makefile.fpc
U packages/postgres/Makefile.fpc
U packages/fcl-fpcunit/Makefile.fpc
U packages/fcl-process/Makefile.fpc
U packages/fcl-image/Makefile.fpc
U packages/os2units/Makefile.fpc
U packages/libxml/Makefile.fpc
U packages/fcl-stl/Makefile.fpc
C packages/libenet
U packages/libpng/Makefile.fpc
U packages/gdbm/Makefile.fpc
U packages/gtk2/Makefile.fpc
U packages/fcl-web/Makefile.fpc
U packages/pcap/Makefile.fpc
U packages/httpd24/Makefile.fpc
U packages/fuse/Makefile.fpc
U packages/amunits/Makefile.fpc
U packages/bzip2/Makefile.fpc
U packages/bfd/Makefile.fpc
U packages/libvlc/Makefile.fpc
U packages/rtl-extra/Makefile.fpc
U packages/rexx/Makefile.fpc
U packages/mad/Makefile.fpc
U packages/libgd/Makefile.fpc
U packages/httpd22/Makefile.fpc
U packages/oggvorbis/Makefile.fpc
U packages/fcl-async/Makefile.fpc
U packages/opengl/Makefile.fpc
U packages/pasjpeg/Makefile.fpc
U packages/morphunits/Makefile.fpc
U packages/fcl-extra/Makefile.fpc
U packages/objcrtl/Makefile.fpc
U packages/syslog/Makefile.fpc
U packages/httpd20/Makefile.fpc
U packages/zlib/Makefile.fpc
U packages/dblib/Makefile.fpc
U packages/ibase/Makefile.fpc
U packages/winunits-base/Makefile.fpc
U packages/mysql/Makefile.fpc
U packages/matroska/Makefile.fpc
U packages/Makefile.fpc
U packages/winunits-jedi/Makefile.fpc
U packages/fpindexer/Makefile.fpc
U packages/univint/Makefile.fpc
U packages/libc/Makefile.fpc
U packages/symbolic/Makefile.fpc
U packages/gnome1/Makefile.fpc
U packages/sqlite/Makefile.fpc
U packages/jni/Makefile.fpc
U packages/sdl/Makefile.fpc
U packages/winceunits/Makefile.fpc
U packages/libtar/Makefile.fpc
U packages/opengles/Makefile.fpc
U packages/fcl-base/Makefile.fpc
U packages/fcl-xml/Makefile.fpc
U packages/aspell/Makefile.fpc
U packages/a52/Makefile.fpc
U packages/fftw/Makefile.fpc
U packages/fcl-json/Makefile.fpc
U packages/ptc/Makefile.fpc
U packages/rtl-console/Makefile.fpc
U packages/ggi/Makefile.fpc
U packages/fv/Makefile.fpc
U packages/opencl/Makefile.fpc
U packages/fastcgi/Makefile.fpc
U packages/gmp/Makefile.fpc
U packages/uuid/Makefile.fpc
U packages/pthreads/Makefile.fpc
U packages/unixutil/Makefile.fpc
U packages/fcl-passrc/Makefile.fpc
U packages/iconvenc/Makefile.fpc
U packages/fcl-registry/Makefile.fpc
U packages/newt/Makefile.fpc
U packages/sndfile/Makefile.fpc
U packages/openal/Makefile.fpc
U packages/pastojs/Makefile.fpc
U packages/oracle/Makefile.fpc
U packages/libgbafpc/Makefile.fpc
U packages/pxlib/Makefile.fpc
U packages/dts/Makefile.fpc
U packages/libsee/Makefile.fpc
U packages/librsvg/Makefile.fpc
U packages/palmunits/Makefile.fpc
U packages/hermes/Makefile.fpc
U packages/xforms/Makefile.fpc
U packages/tcl/Makefile.fpc
U packages/cocoaint/Makefile.fpc
U packages/modplug/Makefile.fpc
U packages/fcl-js/Makefile.fpc
U packages/arosunits/Makefile.fpc
U packages/users/Makefile.fpc
U packages/gdbint/Makefile.fpc
U packages/fpgtk/Makefile.fpc
U packages/lua/Makefile.fpc
U packages/fcl-db/Makefile.fpc
U packages/cairo/Makefile.fpc
U packages/fcl-sound/Makefile.fpc
U packages/svgalib/Makefile.fpc
U utils/fpcmkcfg/Makefile.fpc
U utils/fpcm/Makefile.fpc
U utils/tply/Makefile.fpc
U utils/fppkg/Makefile.fpc
U utils/h2pas/Makefile.fpc
U utils/fpcreslipo/Makefile.fpc
U ide/Makefile.fpc
U utils/fpcres/Makefile.fpc
U utils/Makefile.fpc
U utils/fpmc/Makefile.fpc
U utils/rmwait/Makefile.fpc
U utils/importtl/Makefile.fpc
U utils/pas2js/Makefile.fpc
U utils/dxegen/Makefile.fpc
U utils/debugsvr/Makefile.fpc
U utils/fpcm/Makefile.fpmake.bs.template
U utils/fpdoc/Makefile.fpc
U utils/fprcp/Makefile.fpc
U utils/unicode/Makefile.fpc
U utils/pas2fpm/Makefile.fpc
U utils/fpcm/Makefile.fpmake.template
U utils/mksymbian/Makefile.fpc
U utils/instantfpc/Makefile.fpc
U utils/pas2ut/Makefile.fpc
U utils/pas2jni/Makefile.fpc
--- Recording mergeinfo for merge of r31317 into '.':
U .
Summary of conflicts:
Tree conflicts: 2
Resolved conflicted state of 'packages/googleapi'
Resolved conflicted state of 'packages/libenet'
Summary of conflicts:
Tree conflicts: 0 remaining (and 2 already resolved)
# revisions: 31317
git-svn-id: branches/fixes_3_0@31969 -
U packages/zorba/Makefile
U packages/zorba/Makefile.fpc
U packages/rtl-extra/Makefile.fpc
U packages/rtl-extra/Makefile
U packages/opengl/Makefile
U packages/opengl/Makefile.fpc
U packages/fcl-extra/Makefile
U packages/fcl-extra/Makefile.fpc
U packages/os2units/Makefile
U packages/os2units/Makefile.fpc
U packages/gnome1/Makefile.fpc
U packages/gnome1/Makefile
U packages/imlib/Makefile
U packages/imlib/Makefile.fpc
U packages/sqlite/Makefile.fpc
U packages/sqlite/Makefile
U packages/graph/Makefile
U packages/graph/Makefile.fpc
U packages/unzip/Makefile.fpc
U packages/unzip/Makefile
U packages/uuid/Makefile
U packages/uuid/Makefile.fpc
U packages/fftw/Makefile
U packages/fftw/Makefile.fpc
U packages/librsvg/Makefile
U packages/librsvg/Makefile.fpc
U packages/libvlc/Makefile.fpc
U packages/libvlc/Makefile
U packages/rtl-objpas/Makefile
U packages/rtl-objpas/Makefile.fpc
U packages/nvapi/Makefile.fpc
U packages/nvapi/Makefile
U packages/sndfile/Makefile.fpc
U packages/sndfile/Makefile
U packages/svgalib/Makefile
U packages/svgalib/Makefile.fpc
U packages/bfd/Makefile.fpc
U packages/bfd/Makefile
U packages/proj4/Makefile.fpc
U packages/proj4/Makefile
U packages/iosxlocale/Makefile
U packages/iosxlocale/Makefile.fpc
U packages/paszlib/Makefile.fpc
U packages/paszlib/Makefile
U packages/libgbafpc/Makefile
U packages/libgbafpc/Makefile.fpc
U packages/fcl-registry/Makefile
U packages/fcl-registry/Makefile.fpc
U packages/regexpr/Makefile
U packages/regexpr/Makefile.fpc
U packages/libtar/Makefile.fpc
U packages/libtar/Makefile
U packages/newt/Makefile
U packages/newt/Makefile.fpc
U packages/xforms/Makefile.fpc
U packages/xforms/Makefile
U packages/openal/Makefile
U packages/openal/Makefile.fpc
U packages/aspell/Makefile
U packages/aspell/Makefile.fpc
U packages/jni/Makefile.fpc
U packages/jni/Makefile
U packages/libgd/Makefile
U packages/libgd/Makefile.fpc
U packages/symbolic/Makefile.fpc
U packages/symbolic/Makefile
U packages/ncurses/Makefile
U packages/ncurses/Makefile.fpc
U packages/sdl/Makefile
U packages/sdl/Makefile.fpc
U packages/arosunits/Makefile.fpc
U packages/arosunits/Makefile
U packages/fcl-net/Makefile
U packages/fcl-net/Makefile.fpc
U packages/fcl-res/Makefile
U packages/fcl-res/Makefile.fpc
U packages/mad/Makefile
U packages/mad/Makefile.fpc
U packages/oracle/Makefile
U packages/oracle/Makefile.fpc
U packages/dblib/Makefile
U packages/dblib/Makefile.fpc
U packages/palmunits/Makefile.fpc
U packages/palmunits/Makefile
U packages/fcl-js/Makefile.fpc
U packages/fcl-js/Makefile
U packages/ldap/Makefile
U packages/ldap/Makefile.fpc
U packages/matroska/Makefile
U packages/matroska/Makefile.fpc
U packages/tcl/Makefile.fpc
U packages/tcl/Makefile
U packages/ibase/Makefile
U packages/ibase/Makefile.fpc
U packages/hash/Makefile
U packages/hash/Makefile.fpc
U packages/gmp/Makefile.fpc
U packages/gmp/Makefile
U packages/openssl/Makefile
U packages/openssl/Makefile.fpc
U packages/utmp/Makefile.fpc
U packages/utmp/Makefile
C packages/bzip2/Makefile
U packages/bzip2/Makefile.fpc
U packages/httpd13/Makefile
U packages/httpd13/Makefile.fpc
U packages/a52/Makefile.fpc
U packages/a52/Makefile
U packages/fcl-sdo/Makefile.fpc
U packages/fcl-sdo/Makefile
U packages/winunits-base/Makefile
U packages/winunits-base/Makefile.fpc
U packages/fcl-sound/Makefile.fpc
U packages/fcl-sound/Makefile
U packages/libcurl/Makefile
U packages/libcurl/Makefile.fpc
U packages/dbus/Makefile
U packages/dbus/Makefile.fpc
U packages/libsee/Makefile
U packages/libsee/Makefile.fpc
U packages/fcl-stl/Makefile.fpc
U packages/fcl-stl/Makefile
U packages/libndsfpc/Makefile.fpc
U packages/libndsfpc/Makefile
U packages/mysql/Makefile.fpc
U packages/mysql/Makefile
U packages/gdbint/Makefile
U packages/gdbint/Makefile.fpc
U packages/fcl-base/Makefile.fpc
U packages/fcl-base/Makefile
U packages/opengles/Makefile.fpc
U packages/opengles/Makefile
U packages/fcl-web/Makefile
U packages/fcl-web/Makefile.fpc
U packages/opencl/Makefile
U packages/opencl/Makefile.fpc
U packages/hermes/Makefile
U packages/hermes/Makefile.fpc
U packages/httpd20/Makefile.fpc
U packages/httpd20/Makefile
U packages/ptc/Makefile
U packages/ptc/Makefile.fpc
U packages/httpd22/Makefile.fpc
U packages/httpd22/Makefile
U packages/ami-extra/Makefile
U packages/ami-extra/Makefile.fpc
U packages/fcl-db/Makefile
U packages/fcl-db/Makefile.fpc
U packages/libogcfpc/Makefile
U packages/libogcfpc/Makefile.fpc
U packages/winunits-jedi/Makefile.fpc
U packages/winunits-jedi/Makefile
U packages/httpd24/Makefile.fpc
U packages/httpd24/Makefile
U packages/dts/Makefile.fpc
U packages/dts/Makefile
U packages/univint/Makefile
U packages/univint/Makefile.fpc
U packages/cocoaint/Makefile
U packages/cocoaint/Makefile.fpc
U packages/rtl-console/Makefile
U packages/rtl-console/Makefile.fpc
U packages/gtk1/Makefile.fpc
U packages/gtk1/Makefile
U packages/ggi/Makefile.fpc
U packages/ggi/Makefile
U packages/gtk2/Makefile
U packages/gtk2/Makefile.fpc
U packages/odbc/Makefile
U packages/odbc/Makefile.fpc
U packages/morphunits/Makefile
U packages/morphunits/Makefile.fpc
U packages/gdbm/Makefile
U packages/gdbm/Makefile.fpc
U packages/pthreads/Makefile
U packages/pthreads/Makefile.fpc
U packages/fcl-json/Makefile
U packages/fcl-json/Makefile.fpc
U packages/amunits/Makefile.fpc
U packages/amunits/Makefile
U packages/unixutil/Makefile
U packages/unixutil/Makefile.fpc
U packages/lua/Makefile.fpc
U packages/lua/Makefile
U packages/pcap/Makefile.fpc
U packages/pcap/Makefile
U packages/fcl-image/Makefile.fpc
U packages/fcl-image/Makefile
U packages/numlib/Makefile
U packages/numlib/Makefile.fpc
U packages/winceunits/Makefile.fpc
U packages/winceunits/Makefile
U packages/pasjpeg/Makefile
U packages/pasjpeg/Makefile.fpc
U packages/zlib/Makefile.fpc
U packages/zlib/Makefile
U packages/fuse/Makefile
U packages/fuse/Makefile.fpc
U packages/iconvenc/Makefile
U packages/iconvenc/Makefile.fpc
U packages/chm/Makefile.fpc
U packages/chm/Makefile
U packages/libc/Makefile
U packages/libc/Makefile.fpc
U packages/x11/Makefile
U packages/x11/Makefile.fpc
U packages/pxlib/Makefile
U packages/pxlib/Makefile.fpc
U packages/fpindexer/Makefile
U packages/fpindexer/Makefile.fpc
U packages/libxml/Makefile.fpc
U packages/libxml/Makefile
U packages/imagemagick/Makefile
U packages/imagemagick/Makefile.fpc
U packages/objcrtl/Makefile
U packages/objcrtl/Makefile.fpc
U packages/oggvorbis/Makefile.fpc
U packages/oggvorbis/Makefile
U packages/users/Makefile.fpc
U packages/users/Makefile
U packages/fcl-xml/Makefile
U packages/fcl-xml/Makefile.fpc
U packages/fcl-fpcunit/Makefile.fpc
U packages/fcl-fpcunit/Makefile
U packages/fpgtk/Makefile.fpc
U packages/fpgtk/Makefile
U packages/libpng/Makefile
U packages/libpng/Makefile.fpc
U packages/fcl-async/Makefile
U packages/fcl-async/Makefile.fpc
U packages/fastcgi/Makefile.fpc
U packages/fastcgi/Makefile
U packages/fcl-process/Makefile
U packages/fcl-process/Makefile.fpc
U packages/syslog/Makefile.fpc
U packages/syslog/Makefile
C packages/pastojs/Makefile
U packages/pastojs/Makefile.fpc
U packages/rtl-unicode/Makefile
U packages/rtl-unicode/Makefile.fpc
U packages/rexx/Makefile.fpc
U packages/rexx/Makefile
U packages/fcl-passrc/Makefile.fpc
U packages/fcl-passrc/Makefile
U packages/cairo/Makefile
U packages/cairo/Makefile.fpc
U packages/cdrom/Makefile
U packages/cdrom/Makefile.fpc
U packages/postgres/Makefile
U packages/postgres/Makefile.fpc
U packages/modplug/Makefile.fpc
U packages/modplug/Makefile
U packages/fppkg/Makefile.fpc
U packages/fppkg/Makefile
U packages/fv/Makefile.fpc
U packages/fv/Makefile
Summary of conflicts:
Text conflicts: 2
# revisions: 29409
git-svn-id: branches/fixes_3_0@29414 -
- rm winapi constants that were already included in fpc 2.6.2
* winapi constants that were included in fpc trunk put behind {$ifdef ver2_6}
git-svn-id: trunk@25775 -
Solves issues with systems that e.g. require special options for compilation of programs (e.g. libc programs to find libc startup code) or the actual build has been compiled with options that are incompatible with default ones.
Tested changes by building an i386-linux local build and i386-linux->arm-linux cross-builds
git-svn-id: trunk@22397 -
