Merge branch 'master' of ssh://shion.micecat.ath.cx/~ikari/public_html/git/sd2snes

Conflicts:
	pcb/kicad/fpga.bak
	pcb/kicad/fpga.sch
	pcb/kicad/mcu.bak
	pcb/kicad/mcu.sch
	pcb/kicad/memory.sch
	pcb/kicad/pwr_misc.bak
	pcb/kicad/pwr_misc.sch
	pcb/kicad/sd2snes-cache.bak
	pcb/kicad/sd2snes-cache.lib
	pcb/kicad/sd2snes.bak
	pcb/kicad/sd2snes.sch
	pcb/kicad/snesslot.bak
	pcb/kicad/snesslot.sch
This commit is contained in:
ikari
2010-05-18 22:26:08 +02:00
19 changed files with 1508 additions and 1004 deletions

View File

@@ -1,4 +1,4 @@
EESchema Schematic File Version 2 date Mon 17 May 2010 10:04:37 PM CEST
EESchema Schematic File Version 2 date Tue 18 May 2010 03:12:12 PM CEST
LIBS:power
LIBS:device
LIBS:transistors