From 9bcd40c3e2ecd64cc1f2f1399c6221e289684ecb Mon Sep 17 00:00:00 2001 From: soycamo Date: Mon, 9 Apr 2012 22:25:34 -0700 Subject: Added RET6 chip to board and mapped old pins. Messed up my merge but everything seems to be OK... --- .gitattributes | 2 ++ pepperbacon.brd | Bin 94801 -> 89976 bytes pepperbacon.sch | Bin 146641 -> 159647 bytes 3 files changed, 2 insertions(+) create mode 100644 .gitattributes 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 Binary files a/pepperbacon.brd and b/pepperbacon.brd differ diff --git a/pepperbacon.sch b/pepperbacon.sch index 74d5eea..29c9945 100644 Binary files a/pepperbacon.sch and b/pepperbacon.sch differ -- cgit v1.2.3