ikari 481237636c Merge commit 'v0.1.2' ...

Conflicts:
	cic/supercic/supercic-key.asm
	pcb/kicad/RevE/fpga.sch
	pcb/kicad/RevE/mcu.sch
	pcb/kicad/RevE/memory.sch
	pcb/kicad/RevE/pwr_misc.sch
	pcb/kicad/RevE/sd2snes.brd
	pcb/kicad/RevE/sd2snes.net
	pcb/kicad/RevE/sd2snes.sch
	pcb/kicad/RevE/snesslot.sch
	pcb/kicad/libs/mypackages.mod
	pcb/kicad/libs/sdcard.bak
	pcb/kicad/libs/sdcard.mod
	snes/Makefile
	snes/const.a65
	snes/data.a65
	snes/header.a65
	snes/mainmenu.a65
	snes/memmap.i65
	snes/menu.a65
	snes/text.a65
	snes/time.a65
	src/Makefile
	src/bootldr/Makefile
	src/bootldr/clock.c
	src/bootldr/config.h
	src/bootldr/ffconf.h
	src/bootldr/iap.c
	src/bootldr/lpc1754boot.ld
	src/bootldr/main.c
	src/bootldr/timer.c
	src/bootldr/uart.c
	src/cic.c
	src/cic.h
	src/cli.c
	src/config
	src/config.h
	src/ff.c
	src/ff.h
	src/ffconf.h
	src/fileops.c
	src/fileops.h
	src/filetypes.c
	src/filetypes.h
	src/flash.script
	src/fpga_spi.c
	src/fpga_spi.h
	src/lpc1754.ld
	src/main.c
	src/memory.c
	src/memory.h
	src/msu1.c
	src/sdnative.c
	src/sdnative.h
	src/smc.c
	src/smc.h
	src/snes.h
	verilog/sd2snes/address.v
	verilog/sd2snes/main.ucf
	verilog/sd2snes/main.v
	verilog/sd2snes/mcu_cmd.v
	verilog/sd2snes/sd2snes.xise
	verilog/sd2snes/sd_dma.v

2012-01-14 23:49:04 +01:00

..

libs

Merge commit 'v0.1.2'

2012-01-14 23:49:04 +01:00

RevE

Merge commit 'v0.1.2'

2012-01-14 23:49:04 +01:00

RevE2

PCB: very basic solder paste pad reduction script

2011-12-27 10:31:39 +01:00