• S
    Merge remote-tracking branch 'remotes/origin/ra6m4-cpk-3.5.0' · fc3c29df
    Sherman 提交于
    # Conflicts:
    #	bsp/ra6m4-cpk/.settings/standalone.prefs
    #	bsp/ra6m4-cpk/SConscript
    #	bsp/renesas/ra6m4-cpk/ra_gen/vector_data.h
    #	bsp/renesas/ra6m4-iot/buildinfo.gpdsc
    #	bsp/renesas/ra6m4-iot/project.uvoptx
    #	bsp/renesas/ra6m4-iot/project.uvprojx
    #	bsp/renesas/ra6m4-iot/ra/fsp/inc/api/r_external_irq_api.h
    #	bsp/renesas/ra6m4-iot/ra_gen/SConscript
    fc3c29df
standalone.prefs 6.1 KB