Files
zSoft/.gitignore
Philip Smart a7c0f36b3a Fix conflicts
2021-08-22 10:18:25 +01:00

106 lines
1.2 KiB
Plaintext

.metadata
.dm
.gradle
/Releases
/.nb-gradle/
*.bin
*.dmp
*.elf
*.lss
*.map
*.rpt
*.srec
*.swp
*.log
*.done
*.smsg
*.summary
*.jdi
*.pin
*.out.sdc
*.sof
*.sld
*.rbf
*.qws
*.sav
*.pof
*.qdf
*.srf
*.o
*.tmp
*.swo
*.swp
.*.swo
.*.swp
*.out
*.d
*.old
*.dmp*
*.lss*
c5_pin_model_dump.txt
build/db/
build/incremental_db/
build/output_files/
build/simulation/
apps/*/build/
apps/*/*_obj/
libraries/build/
zputa/build/
zOS/build/
iocp/iocp_obj/
build/*
old/*
*/old/*
*/*/old/*
*/*/*/old/*
iocp/test
startup/*0x*.ld
apps/*/*.zpu
apps/*/*.k64
common/old2
include.bak
libraries/umlibc/misc2
apps/tzpu/tzpu.c.1605
apps/tzpu/tzpu.h.1605
c
teensy3/TeensyThreads/
x
zOS/main.hex
zOS/*.i
zOS/*.ii
zOS/*.s
zputa/*.i
zputa/*.ii
zputa/*.s
zOS/main.save
<<<<<<< HEAD
/tzio/
.dobuild
SD/
=======
.dobuild
SD/
common/osd.sav.c
>>>>>>> 5a59ff2f96064433b95b8489dbe7e9b175b0accc
frdm/
frdmk64f_usb_msd_host_bootloader_mcux.zip
frdmk64f_usb_msd_host_bootloader_mcux/
getopt_long.c
<<<<<<< HEAD
libraries/include/optparse.h
minicom.cap
startup/app_zos_zpu.tmpl2
zOS/main.bak
common/osd.sav.c
rrrr
startup/app_zos_zpu.tmpl3
=======
minicom.cap
rrrr
startup/app_zos_zpu.tmpl2
startup/app_zos_zpu.tmpl3
tzio/
zOS/main.bak
>>>>>>> 5a59ff2f96064433b95b8489dbe7e9b175b0accc