Merge branch 'master' of ssh://github.com/jwcxz/bcard

Conflicts: boards/bcard/bcard-Front.pdf boards/bcard/bcard.000 boards/bcard/bcard.brd
jwcxz · Jun 10, 2012 · e745d26 · e745d26
2 parents 239c351 + b03d8ca
commit e745d26
Show file tree

Hide file tree

Showing 7 changed files with 831 additions and 807 deletions.
diff --git a/boards/bcard/bcard-3d.png b/boards/bcard/bcard-3d.png
diff --git a/boards/bcard/bcard-Front.pdf b/boards/bcard/bcard-Front.pdf
diff --git a/boards/bcard/bcard-Front.ps b/boards/bcard/bcard-Front.ps
diff --git a/boards/bcard/bcard-brd.png b/boards/bcard/bcard-brd.png