marco 6c543c43fa --- Merging r29600 into '.': ... 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 -		2015-03-12 20:37:55 +00:00
..
classes.pp
cprt07.as
cprt09.as
dos.pp
libc.inc
libch.inc
Makefile	* makefile regen and version updates.	2015-01-05 15:04:54 +00:00
Makefile.fpc	--- Merging r29600 into '.':	2015-03-12 20:37:55 +00:00
nds.inc
ndsbios.inc
ndsbiosh.inc
ndsh.inc
prt07.as
prt09.as
rtl.cfg	--- Merging r29600 into '.':	2015-03-12 20:37:55 +00:00
rtldefs.inc	+ FPCRTL_FILESYSTEM_SINGLE_BYTE_API define that is set for targets where we	2013-06-27 21:37:39 +00:00
sysdir.inc	+ added mkdir/chdir/rmdir(rawbytestring) and (unicodestring) to the system unit	2013-07-04 22:28:37 +00:00
sysfile.inc	* Reset filerec mode field to fmClosed if the system call to open the file failed	2014-11-23 21:49:29 +00:00
sysheap.inc
sysos.inc
sysosh.inc
system.pp	--- Merging r29600 into '.':	2015-03-12 20:37:55 +00:00
systhrd.inc
sysutils.pp	--- Merging r29600 into '.':	2015-03-12 20:37:55 +00:00
tthread.inc	Extend TThread with (class) methods and (class) properties from Delphi 2007 and newer.	2012-12-27 16:16:17 +00:00