aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsoycamo <cameron@soycow.org>2012-04-09 22:25:34 -0700
committersoycamo <cameron@soycow.org>2012-04-09 22:25:34 -0700
commit9bcd40c3e2ecd64cc1f2f1399c6221e289684ecb (patch)
tree848b839260c6c0d1f39e737518684d0a0a4744ce
parentb35a1ce85d2de1cb4379309c13ebf270d88268c1 (diff)
Added RET6 chip to board and mapped old pins.
Messed up my merge but everything seems to be OK...
-rw-r--r--.gitattributes2
-rw-r--r--pepperbacon.brdbin94801 -> 89976 bytes
-rw-r--r--pepperbacon.schbin146641 -> 159647 bytes
3 files changed, 2 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..26c289e
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+*.brd binary merge=useTheirs
+*.sch binary merge=useTheirs
diff --git a/pepperbacon.brd b/pepperbacon.brd
index f7db1fa..565c07b 100644
--- a/pepperbacon.brd
+++ b/pepperbacon.brd
Binary files differ
diff --git a/pepperbacon.sch b/pepperbacon.sch
index 74d5eea..29c9945 100644
--- a/pepperbacon.sch
+++ b/pepperbacon.sch
Binary files differ