U utils/fppkg/lnet/ltelnet.pp
U utils/fppkg/lnet/lcontrolstack.pp
--- Merging r29467 into '.':
U packages/paszlib/src/zipper.pp
--- Merging r29468 into '.':
U utils/fppkg/lnet/lftp.pp
# revisions: 29465,29466,29467,29468
git-svn-id: branches/fixes_3_0@30824 -
U utils/h2pas/h2plexlib.pas
U utils/h2pas/scan.l
U utils/h2pas/h2pas.y
U utils/h2pas/h2poptions.pas
U utils/h2pas/h2pas.pas
U utils/h2pas/h2pyacclib.pas
U utils/h2pas/scan.pas
# revisions: 29425
git-svn-id: branches/fixes_3_0@30822 -
U rtl/win/wininc/base.inc
U rtl/win/wininc/func.inc
U rtl/win/wininc/defines.inc
U rtl/win/wininc/struct.inc
--- Merging r30185 into '.':
G rtl/win/wininc/func.inc
--- Merging r30256 into '.':
G rtl/win/wininc/base.inc
--- Merging r30264 into '.':
G rtl/win/wininc/struct.inc
--- Merging r30279 into '.':
G rtl/win/wininc/struct.inc
# revisions: 30182,30185,30256,30264,30279
git-svn-id: branches/fixes_3_0@30328 -
U compiler/powerpc/cgcpu.pas
U compiler/powerpc/cpubase.pas
U compiler/powerpc64/cgcpu.pas
U compiler/ncgutil.pas
U compiler/ppcgen/hlcgppc.pas
A tests/webtbs/tw27634.pp
--- Merging r30169 into '.':
U compiler/pdecobj.pas
A tests/test/tobjc43.pp
--- Merging r30177 into '.':
U compiler/pexpr.pas
A tests/test/tmacfunret2.pp
--- Merging r30178 into '.':
U compiler/options.pas
--- Merging r30204 into '.':
U compiler/i8086/cpupara.pas
--- Merging r30208 into '.':
U compiler/powerpc64/cpubase.pas
U compiler/powerpc64/itcpugas.pas
--- Merging r30209 into '.':
U rtl/linux/si_intf.inc
--- Merging r30219 into '.':
U compiler/powerpc64/cpupara.pas
# revisions: 30164,30169,30177,30178,30204,30208,30209,30219
git-svn-id: branches/fixes_3_0@30252 -
U packages/libogcfpc/fpmake.pp
U packages/libogcfpc/src/ogc/gx.inc
A packages/libogcfpc/src/ogc/libversion.inc
U packages/libogcfpc/src/wiikeyboard/wsksymdef.inc
U packages/libogcfpc/src/bte/bte.inc
U packages/libogcfpc/src/gccore.inc
U packages/libogcfpc/Makefile.fpc.fpcmake
U packages/libogcfpc/examples/audio/mp3player/Makefile.fpc
U packages/mad/fpmake.pp
A rtl/wii/rtl.cfg
U rtl/wii/system.pp
U rtl/wii/sysutils.pp
U rtl/wii/Makefile.fpc
U rtl/wii/sysdir.inc
U compiler/systems/t_wii.pas
--- Merging r30161 into '.':
G rtl/wii/sysdir.inc
# revisions: 30125,30161
git-svn-id: branches/fixes_3_0@30171 -
U rtl/gba/Makefile
U rtl/gba/Makefile.fpc
--- Merging r30008 into '.':
U packages/libndsfpc/fpmake.pp
U packages/libndsfpc/src/nds/libversion.inc
U packages/libndsfpc/src/nds/system.inc
U packages/libndsfpc/src/nds/fifocommon.inc
U packages/libndsfpc/src/nds/fifomessages.inc
U packages/libndsfpc/examples/debugging/exceptionTest/Makefile.fpc
U packages/libndsfpc/examples/ds_motion/Makefile.fpc
U packages/libndsfpc/examples/time/stopwatch/Makefile.fpc
U packages/libndsfpc/examples/time/timercallback/Makefile.fpc
U packages/libndsfpc/examples/time/RealTimeClock/Makefile.fpc
U packages/libndsfpc/examples/input/keyboard/keyboard_stdin/Makefile.fpc
U packages/libndsfpc/examples/input/keyboard/keyboard_async/Makefile.fpc
U packages/libndsfpc/examples/input/Touch_Pad/touch_test/Makefile.fpc
U packages/libndsfpc/examples/input/Touch_Pad/touch_look/Makefile.fpc
U packages/libndsfpc/examples/input/Touch_Pad/touch_area/Makefile.fpc
U packages/libndsfpc/examples/graphics/Effects/windows/Makefile.fpc
U packages/libndsfpc/examples/graphics/Ext_Palettes/backgrounds/Makefile.fpc
D packages/libndsfpc/examples/graphics/Ext_Palettes/backgrounds/inc
U packages/libndsfpc/examples/graphics/Backgrounds/256_color_bmp/Makefile.fpc
U packages/libndsfpc/examples/graphics/Backgrounds/all_in_one/Makefile.fpc
U packages/libndsfpc/examples/graphics/Backgrounds/rotation/Makefile.fpc
U packages/libndsfpc/examples/graphics/Backgrounds/16bit_color_bmp/Makefile.fpc
U packages/libndsfpc/examples/graphics/Backgrounds/Double_Buffer/Makefile.fpc
U packages/libndsfpc/examples/graphics/3D/Display_List/Makefile.fpc
U packages/libndsfpc/examples/graphics/3D/Mixed_Text_3D/Makefile.fpc
U packages/libndsfpc/examples/graphics/3D/Paletted_Cube/Makefile.fpc
U packages/libndsfpc/examples/graphics/3D/Textured_Cube/Makefile.fpc
U packages/libndsfpc/examples/graphics/3D/Env_Mapping/Makefile.fpc
U packages/libndsfpc/examples/graphics/3D/Simple_Quad/Makefile.fpc
U packages/libndsfpc/examples/graphics/3D/3D_Both_Screens/Makefile.fpc
U packages/libndsfpc/examples/graphics/3D/Simple_Tri/Makefile.fpc
U packages/libndsfpc/examples/graphics/3D/Toon_Shading/Makefile.fpc
U packages/libndsfpc/examples/graphics/3D/Textured_Quad/Makefile.fpc
U packages/libndsfpc/examples/graphics/3D/nehe/lesson07/Makefile.fpc
U packages/libndsfpc/examples/graphics/3D/nehe/lesson08/Makefile.fpc
U packages/libndsfpc/examples/graphics/3D/nehe/lesson09/Makefile.fpc
U packages/libndsfpc/examples/graphics/3D/nehe/lesson01/Makefile.fpc
U packages/libndsfpc/examples/graphics/3D/nehe/lesson10/Makefile.fpc
U packages/libndsfpc/examples/graphics/3D/nehe/lesson02/Makefile.fpc
U packages/libndsfpc/examples/graphics/3D/nehe/lesson11/Makefile.fpc
U packages/libndsfpc/examples/graphics/3D/nehe/lesson03/Makefile.fpc
U packages/libndsfpc/examples/graphics/3D/nehe/lesson10b/Makefile.fpc
U packages/libndsfpc/examples/graphics/3D/nehe/lesson04/Makefile.fpc
U packages/libndsfpc/examples/graphics/3D/nehe/lesson05/Makefile.fpc
U packages/libndsfpc/examples/graphics/3D/nehe/lesson06/Makefile.fpc
U packages/libndsfpc/examples/graphics/3D/Display_List_2/Makefile.fpc
U packages/libndsfpc/examples/graphics/3D/Picking/Makefile.fpc
U packages/libndsfpc/examples/graphics/3D/BoxTest/Makefile.fpc
U packages/libndsfpc/examples/graphics/3D/Ortho/Makefile.fpc
U packages/libndsfpc/examples/graphics/Sprites/animate_simple/Makefile.fpc
U packages/libndsfpc/examples/graphics/Sprites/sprite_extended_palettes/Makefile.fpc
U packages/libndsfpc/examples/graphics/Sprites/simple/Makefile.fpc
U packages/libndsfpc/examples/graphics/Sprites/fire_and_sprites/Makefile.fpc
U packages/libndsfpc/examples/graphics/Sprites/allocation_test/Makefile.fpc
U packages/libndsfpc/examples/graphics/Sprites/sprite_rotate/Makefile.fpc
U packages/libndsfpc/examples/graphics/Sprites/bitmap_sprites/Makefile.fpc
U packages/libndsfpc/examples/graphics/Printing/ansi_console/Makefile.fpc
U packages/libndsfpc/examples/graphics/Printing/console_windows/Makefile.fpc
U packages/libndsfpc/examples/graphics/Printing/custom_font/Makefile.fpc
U packages/libndsfpc/examples/graphics/Printing/rotscale_text/Makefile.fpc
U packages/libndsfpc/examples/graphics/Printing/print_both_screens/Makefile.fpc
U packages/libndsfpc/examples/audio/maxmod/reverb/Makefile.fpc
U packages/libndsfpc/examples/audio/maxmod/song_events_example/Makefile.fpc
U packages/libndsfpc/examples/audio/maxmod/song_events_example2/Makefile.fpc
U packages/libndsfpc/examples/audio/maxmod/audio_modes/Makefile.fpc
U packages/libndsfpc/examples/audio/maxmod/basic_sound/Makefile.fpc
A packages/libndsfpc/examples/audio/maxmod/streaming
A packages/libndsfpc/examples/audio/maxmod/streaming/Makefile
A packages/libndsfpc/examples/audio/maxmod/streaming/Makefile.fpc
A packages/libndsfpc/examples/audio/maxmod/streaming/streaming.pp
U packages/libndsfpc/examples/audio/micrecord/Makefile.fpc
U packages/libndsfpc/examples/filesystem/libfat/access_dir/Makefile.fpc
U packages/libndsfpc/examples/filesystem/libfat/access_file/Makefile.fpc
U packages/libndsfpc/examples/filesystem/libfat/libfatdir/Makefile.fpc
U packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/Makefile.fpc
U packages/libndsfpc/examples/filesystem/embedded_gbfs/Makefile.fpc
U packages/libndsfpc/examples/dswifi/ap_search/Makefile.fpc
U packages/libndsfpc/examples/dswifi/httpget/Makefile.fpc
U packages/libndsfpc/examples/dswifi/autoconnect/Makefile.fpc
U packages/libndsfpc/examples/gl2d/dual_screen/Makefile.fpc
U packages/libndsfpc/examples/gl2d/fonts/Makefile.fpc
U packages/libndsfpc/examples/gl2d/sprites/Makefile.fpc
U packages/libndsfpc/examples/gl2d/primitives/Makefile.fpc
U packages/libndsfpc/examples/gl2d/scrolling/Makefile.fpc
U packages/libndsfpc/examples/gl2d/2Dplus3D/Makefile.fpc
U packages/libndsfpc/examples/card/eeprom/Makefile.fpc
U packages/libndsfpc/examples/hello_world/Makefile.fpc
U rtl/nds/sysutils.pp
U rtl/nds/Makefile.fpc
A rtl/nds/rtl.cfg
U rtl/nds/system.pp
Skipped 'rtl/gba/rtl.cfg'
--- Merging r30074 into '.':
C rtl/gba/Makefile
G rtl/gba/Makefile.fpc
U packages/libgbafpc/Makefile.fpc.fpcmake
G packages/libndsfpc/examples/hello_world/Makefile.fpc
G packages/libndsfpc/examples/debugging/exceptionTest/Makefile.fpc
G packages/libndsfpc/examples/ds_motion/Makefile.fpc
G packages/libndsfpc/examples/time/stopwatch/Makefile.fpc
G packages/libndsfpc/examples/time/timercallback/Makefile.fpc
G packages/libndsfpc/examples/time/RealTimeClock/Makefile.fpc
G packages/libndsfpc/examples/input/keyboard/keyboard_stdin/Makefile.fpc
G packages/libndsfpc/examples/input/keyboard/keyboard_async/Makefile.fpc
G packages/libndsfpc/examples/input/Touch_Pad/touch_look/Makefile.fpc
G packages/libndsfpc/examples/input/Touch_Pad/touch_area/Makefile.fpc
G packages/libndsfpc/examples/input/Touch_Pad/touch_test/Makefile.fpc
G packages/libndsfpc/examples/graphics/Effects/windows/Makefile.fpc
G packages/libndsfpc/examples/graphics/Ext_Palettes/backgrounds/Makefile.fpc
G packages/libndsfpc/examples/graphics/Backgrounds/all_in_one/Makefile.fpc
G packages/libndsfpc/examples/graphics/Backgrounds/rotation/Makefile.fpc
G packages/libndsfpc/examples/graphics/Backgrounds/16bit_color_bmp/Makefile.fpc
G packages/libndsfpc/examples/graphics/Backgrounds/Double_Buffer/Makefile.fpc
G packages/libndsfpc/examples/graphics/Backgrounds/256_color_bmp/Makefile.fpc
G packages/libndsfpc/examples/graphics/3D/Picking/Makefile.fpc
G packages/libndsfpc/examples/graphics/3D/BoxTest/Makefile.fpc
G packages/libndsfpc/examples/graphics/3D/Ortho/Makefile.fpc
G packages/libndsfpc/examples/graphics/3D/Display_List/Makefile.fpc
G packages/libndsfpc/examples/graphics/3D/Mixed_Text_3D/Makefile.fpc
G packages/libndsfpc/examples/graphics/3D/Paletted_Cube/Makefile.fpc
G packages/libndsfpc/examples/graphics/3D/Textured_Cube/Makefile.fpc
G packages/libndsfpc/examples/graphics/3D/Env_Mapping/Makefile.fpc
G packages/libndsfpc/examples/graphics/3D/Simple_Quad/Makefile.fpc
G packages/libndsfpc/examples/graphics/3D/3D_Both_Screens/Makefile.fpc
G packages/libndsfpc/examples/graphics/3D/Simple_Tri/Makefile.fpc
G packages/libndsfpc/examples/graphics/3D/Toon_Shading/Makefile.fpc
G packages/libndsfpc/examples/graphics/3D/Textured_Quad/Makefile.fpc
G packages/libndsfpc/examples/graphics/3D/nehe/lesson01/Makefile.fpc
G packages/libndsfpc/examples/graphics/3D/nehe/lesson10/Makefile.fpc
G packages/libndsfpc/examples/graphics/3D/nehe/lesson02/Makefile.fpc
G packages/libndsfpc/examples/graphics/3D/nehe/lesson11/Makefile.fpc
G packages/libndsfpc/examples/graphics/3D/nehe/lesson03/Makefile.fpc
G packages/libndsfpc/examples/graphics/3D/nehe/lesson10b/Makefile.fpc
G packages/libndsfpc/examples/graphics/3D/nehe/lesson04/Makefile.fpc
G packages/libndsfpc/examples/graphics/3D/nehe/lesson05/Makefile.fpc
G packages/libndsfpc/examples/graphics/3D/nehe/lesson06/Makefile.fpc
G packages/libndsfpc/examples/graphics/3D/nehe/lesson07/Makefile.fpc
G packages/libndsfpc/examples/graphics/3D/nehe/lesson08/Makefile.fpc
G packages/libndsfpc/examples/graphics/3D/nehe/lesson09/Makefile.fpc
G packages/libndsfpc/examples/graphics/3D/Display_List_2/Makefile.fpc
G packages/libndsfpc/examples/graphics/Sprites/simple/Makefile.fpc
G packages/libndsfpc/examples/graphics/Sprites/fire_and_sprites/Makefile.fpc
G packages/libndsfpc/examples/graphics/Sprites/allocation_test/Makefile.fpc
G packages/libndsfpc/examples/graphics/Sprites/sprite_rotate/Makefile.fpc
G packages/libndsfpc/examples/graphics/Sprites/bitmap_sprites/Makefile.fpc
G packages/libndsfpc/examples/graphics/Sprites/animate_simple/Makefile.fpc
G packages/libndsfpc/examples/graphics/Sprites/sprite_extended_palettes/Makefile.fpc
G packages/libndsfpc/examples/graphics/Printing/ansi_console/Makefile.fpc
G packages/libndsfpc/examples/graphics/Printing/console_windows/Makefile.fpc
G packages/libndsfpc/examples/graphics/Printing/custom_font/Makefile.fpc
G packages/libndsfpc/examples/graphics/Printing/rotscale_text/Makefile.fpc
G packages/libndsfpc/examples/graphics/Printing/print_both_screens/Makefile.fpc
G packages/libndsfpc/examples/audio/maxmod/reverb/Makefile.fpc
G packages/libndsfpc/examples/audio/maxmod/song_events_example/Makefile.fpc
G packages/libndsfpc/examples/audio/maxmod/song_events_example2/Makefile.fpc
G packages/libndsfpc/examples/audio/maxmod/audio_modes/Makefile.fpc
G packages/libndsfpc/examples/audio/maxmod/basic_sound/Makefile.fpc
U packages/libndsfpc/examples/audio/maxmod/streaming/Makefile.fpc
G packages/libndsfpc/examples/audio/micrecord/Makefile.fpc
G packages/libndsfpc/examples/filesystem/libfat/access_dir/Makefile.fpc
G packages/libndsfpc/examples/filesystem/libfat/access_file/Makefile.fpc
G packages/libndsfpc/examples/filesystem/libfat/libfatdir/Makefile.fpc
G packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/Makefile.fpc
G packages/libndsfpc/examples/filesystem/embedded_gbfs/Makefile.fpc
G packages/libndsfpc/examples/dswifi/autoconnect/Makefile.fpc
G packages/libndsfpc/examples/dswifi/ap_search/Makefile.fpc
G packages/libndsfpc/examples/dswifi/httpget/Makefile.fpc
G packages/libndsfpc/examples/gl2d/fonts/Makefile.fpc
G packages/libndsfpc/examples/gl2d/sprites/Makefile.fpc
G packages/libndsfpc/examples/gl2d/primitives/Makefile.fpc
G packages/libndsfpc/examples/gl2d/scrolling/Makefile.fpc
G packages/libndsfpc/examples/gl2d/2Dplus3D/Makefile.fpc
G packages/libndsfpc/examples/gl2d/dual_screen/Makefile.fpc
G packages/libndsfpc/examples/card/eeprom/Makefile.fpc
Summary of conflicts:
Text conflicts: 1
Skipped paths: 1
# revisions: 29600,30008,30074
git-svn-id: branches/fixes_3_0@30170 -
This merge fixes disassembly error from Stack Window
------------------------------------------------------------------------
r30095 | pierre | 2015-03-04 18:37:57 +0100 (Wed, 04 Mar 2015) | 3 lines
Changed paths:
M /trunk/packages/gdbint/src/gdbint.pp
Add missing gdbarch field for annotate_frame_begin for version 7.0 or above
Try to cope with buffering problems to catch complete argument list
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_0@30098 -
------------------------------------------------------------------------
r29667 | pierre | 2015-02-11 00:03:09 +0100 (Wed, 11 Feb 2015) | 1 line
Changed paths:
M /trunk/packages/gdbint/src/gdbcon.pp
Also include gdblib.inc if USE_GDBIBINC macro is set, needed to get USE_MINGW_GDB macro used inside UnixDir
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_0@30096 -
U compiler/psub.pas
A tests/tbs/tb0609.pp
--- Merging r29691 into '.':
U rtl/inc/system.inc
# revisions: 29590,29691
git-svn-id: branches/fixes_3_0@29770 -
U rtl/os2/dos.pas
--- Merging r29668 into '.':
U rtl/os2/sysutils.pp
--- Merging r29669 into '.':
U rtl/os2/sysfile.inc
--- Merging r29700 into '.':
U compiler/systems/t_os2.pas
# revisions: 29666,29668,29669,29700
git-svn-id: branches/fixes_3_0@29767 -
U packages/chm/src/chmwriter.pas
U packages/chm/src/chmfilewriter.pas
U packages/chm/src/chmcmd.lpr
--- Merging r29546 into '.':
U rtl/inc/system.fpd
--- Merging r29547 into '.':
U utils/fpdoc/fpdoc.pp
--- Merging r29548 into '.':
U utils/fpdoc/makeskel.pp
--- Merging r29550 into '.':
G packages/chm/src/chmcmd.lpr
# revisions: 29545,29546,29547,29548,29550
git-svn-id: branches/fixes_3_0@29720 -
U compiler/symtable.pas
A tests/webtbs/tw26483.pp
--- Merging r29484 into '.':
U compiler/nutils.pas
A tests/tbf/tb0250.pp
A tests/webtbs/tw26481.pp
# revisions: 29482,29484
git-svn-id: branches/fixes_3_0@29715 -
C compiler/msgtxt.inc
U compiler/symtable.pas
U compiler/msg/errore.msg
C compiler/msgidx.inc
A tests/test/tobjc41.pp
A tests/test/thlp48.pp
A tests/test/uobjc41.pp
# revisions: 29497,29498
git-svn-id: branches/fixes_3_0@29690 -
U packages/fcl-db/src/sqldb/mssql/mssqlconn.pp
--- Merging r29442 into '.':
U packages/fcl-db/src/base/bufdataset.pas
U packages/fcl-db/src/sqldb/sqldb.pp
--- Merging r29443 into '.':
G packages/fcl-db/src/sqldb/mssql/mssqlconn.pp
G packages/fcl-db/src/sqldb/sqldb.pp
G packages/fcl-db/src/base/bufdataset.pas
U packages/fcl-db/src/base/db.pas
U packages/fcl-db/tests/testsqldb.pas
--- Merging r29448 into '.':
U packages/fcl-db/src/sqldb/sqlite/sqlite3conn.pp
U packages/fcl-db/src/sqldb/mysql/mysqlconn.inc
--- Merging r29451 into '.':
G packages/fcl-db/tests/testsqldb.pas
--- Merging r29462 into '.':
G packages/fcl-db/tests/testsqldb.pas
--- Merging r29479 into '.':
U packages/fcl-db/src/sqldb/postgres/pqconnection.pp
--- Merging r29480 into '.':
G packages/fcl-db/tests/testsqldb.pas
--- Merging r29507 into '.':
G packages/fcl-db/src/sqldb/postgres/pqconnection.pp
--- Merging r29624 into '.':
G packages/fcl-db/src/base/db.pas
U packages/fcl-db/src/base/fields.inc
--- Merging r29638 into '.':
U packages/rtl-unicode/fpmake.pp
U packages/rtl-unicode/src/inc/cpbuildu.pp
A packages/rtl-unicode/src/inc/cp895.pas
A rtl/ucmaps/cp895.txt
--- Merging r29662 into '.':
U packages/fcl-db/src/sqldb/mssql/readme.txt
--- Merging r29679 into '.':
U packages/fcl-db/src/base/dsparams.inc
U packages/fcl-db/src/base/datasource.inc
G packages/fcl-db/tests/testsqldb.pas
# revisions: 29430,29442,29443,29448,29451,29462,29479,29480,29507,29624,29638,29662,29679
git-svn-id: branches/fixes_3_0@29682 -
A tests/test/cg/obj/solaris/i386/tcext6.o
A tests/test/cg/obj/solaris/i386/cpptcl2.o
--- Merging r29536 into '.':
A tests/test/cg/obj/solaris/x86_64/tcext6.o
A tests/test/cg/obj/solaris/x86_64/cpptcl2.o
# revisions: 29535,29536
git-svn-id: branches/fixes_3_0@29661 -
U compiler/systems/t_sunos.pas
--- Merging r29520 into '.':
U compiler/systems/i_sunos.pas
--- Merging r29521 into '.':
G compiler/systems/t_sunos.pas
--- Merging r29647 into '.':
G compiler/systems/t_sunos.pas
--- Merging r29549 into '.':
G compiler/systems/t_sunos.pas
--- Merging r29575 into '.':
G compiler/systems/i_sunos.pas
# revisions: 29501,29520,29521,29647,29549,29575
git-svn-id: branches/fixes_3_0@29658 -
U packages/rtl-unicode/fpmake.pp
--- Merging r29568 into '.':
U utils/unicode/fpmake.pp
--- Merging r29571 into '.':
U rtl/os2/sysucode.inc
--- Merging r29572 into '.':
U rtl/os2/system.pas
U rtl/os2/sysos.inc
G rtl/os2/sysucode.inc
--- Merging r29573 into '.':
U compiler/systems/t_os2.pas
--- Merging r29618 into '.':
G utils/unicode/fpmake.pp
--- Merging r29620 into '.':
U installer/install.dat
--- Merging r29623 into '.':
U rtl/objpas/fpwidestring.pp
--- Merging r29625 into '.':
G rtl/os2/sysucode.inc
--- Merging r29629 into '.':
G rtl/os2/sysucode.inc
--- Merging r29630 into '.':
U packages/fcl-db/src/dbase/dbf_wos2.inc
--- Merging r29631 into '.':
G packages/fcl-db/src/dbase/dbf_wos2.inc
--- Merging r29632 into '.':
U packages/fcl-db/src/dbase/dbf_common.inc
U packages/fcl-db/src/dbase/dbf_common.pas
# revisions: 29567,29568,29571,29572,29573,29618,29620,29623,29625,29629,29630,29631,29632
git-svn-id: branches/fixes_3_0@29634 -
U rtl/os2/dos.pas
--- Merging r29530 into '.':
G rtl/os2/dos.pas
--- Merging r29538 into '.':
G rtl/os2/dos.pas
# revisions: 29529,29530,29538
git-svn-id: branches/fixes_3_0@29544 -
U rtl/os2/dos.pas
--- Merging r29531 into '.':
G rtl/os2/dos.pas
--- Merging r29532 into '.':
G rtl/os2/dos.pas
--- Merging r29539 into '.':
U rtl/os2/system.pas
--- Merging r29540 into '.':
U compiler/systems/t_os2.pas
# revisions: 29526,29531,29532,29539,29540
git-svn-id: branches/fixes_3_0@29543 -
U compiler/ncgutil.pas
--- Merging r29452 into '.':
A tests/webtbs/tw27294.pp
A tests/webtbs/uw27294.pp
# revisions: 29450,29452
git-svn-id: branches/fixes_3_0@29510 -
U rtl/inc/system.fpd
--- Merging r29470 into '.':
G rtl/inc/system.fpd
--- Merging r29475 into '.':
U compiler/msg/errore.msg
U compiler/msgtxt.inc
--- Merging r29477 into '.':
U rtl/dragonfly/x86_64/cprt0.as
--- Merging r29478 into '.':
U packages/openssl/src/openssl.pas
--- Merging r29491 into '.':
U installer/install.dat
--- Merging r29492 into '.':
U rtl/os2/sysos.inc
U rtl/os2/sysucode.inc
--- Merging r29494 into '.':
U utils/fpmake.pp
# revisions: 29469,29470,29475,29477,29478,29491,29492,29494
git-svn-id: branches/fixes_3_0@29505 -
U utils/fpcmkcfg/fpc.cft
--- Merging r29437 into '.':
U Makefile.fpc
U Makefile
--- Merging r29440 into '.':
U packages/fcl-res/fpmake.pp
--- Merging r29453 into '.':
U utils/fpcmkcfg/fpccfg.inc
# revisions: 29434,29437,29440,29453
git-svn-id: branches/fixes_3_0@29463 -
U compiler/m68k/cpubase.pas
--- Merging r29428 into '.':
U packages/ami-extra/src/cliputils.pas
--- Merging r29432 into '.':
U rtl/os2/system.pas
U rtl/os2/sysos.inc
U rtl/os2/sysucode.inc
--- Merging r29433 into '.':
U rtl/os2/doscall2.pas
U rtl/os2/doscalls.pas
--- Merging r29441 into '.':
G rtl/os2/sysucode.inc
--- Merging r29457 into '.':
G rtl/os2/sysucode.inc
G rtl/os2/sysos.inc
# revisions: 29407,29428,29432,29433,29441,29457
git-svn-id: branches/fixes_3_0@29461 -
------------------------------------------------------------------------
r29454 | pierre | 2015-01-12 17:54:39 +0100 (Mon, 12 Jan 2015) | 1 line
Test skipped for go32v2, because it forbids the testsuite to complete without manually killing the program
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_0@29455 -
U rtl/unix/dl.pp
U rtl/android/Makefile.fpc
A rtl/android/dlandroid.inc
U rtl/android/Makefile
--- Merging r29402 into '.':
U utils/fpcm/revision.inc
--- Merging r29418 into '.':
U rtl/android/dlandroid.inc
--- Merging r29419 into '.':
U utils/pas2jni/readme.txt
U utils/pas2jni/writer.pas
U utils/pas2jni/ppuparser.pas
--- Merging r29420 into '.':
U packages/fcl-db/src/sqldb/odbc/odbcconn.pas
# revisions: 29401,29402,29418,29419,29420
git-svn-id: branches/fixes_3_0@29421 -
