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

Browse Source

Conflicts:
	pcb/kicad/$savepcb.brd

...

This commit is contained in:

ikari 2010-06-30 21:03:56 +02:00

parent 3ecc705d88 b2441c3f3d

commit 9b2433cbae

2 changed files with 6126 additions and 737 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6232

pcb/kicad/$savepcb.brd

File diff suppressed because it is too large Load Diff

631

pcb/kicad/sd2snes.brd

File diff suppressed because it is too large Load Diff