seniordesign-hardware Changeset - 8ac8611a6b95

Changeset - 8ac8611a6b95

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

ethanzonca@CL-ENS241-08.cedarville.edu - 12 years ago 2013-01-31 14:20:11
ethanzonca@CL-ENS241-08.cedarville.edu

Merge EPF conflicts

1 file changed with 3 insertions and 10 deletions:

master/eagle.epf

0 comments (0 inline, 0 general)

master/eagle.epf

➞

Show inline comments

@@ @@ -336,24 +336,17 @@ UsedLibrary="C:/Program Files (x86)/EAGL @@
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/xilinx-virtex-v5.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/xilinx-xc18v.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/xilinx-xc9.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/xilinx-xcv.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/zetex.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/zilog.lbr"
 UsedLibrary="C:/Users/mkroening/Documents/eagle/seniordesign-hardware/lbr/adafruit.lbr"
 UsedLibrary="C:/Users/mkroening/Documents/eagle/seniordesign-hardware/lbr/dp_devices.lbr"
 UsedLibrary="C:/Users/mkroening/Documents/eagle/seniordesign-hardware/lbr/Protofusion.lbr"
 UsedLibrary="C:/Users/mkroening/Documents/eagle/seniordesign-hardware/lbr/SeniorDesign.lbr"
 UsedLibrary="C:/Users/mkroening/Documents/eagle/seniordesign-hardware/lbr/SLAT-CON-JST-ZH.lbr"
 UsedLibrary="C:/Users/mkroening/Documents/eagle/seniordesign-hardware/lbr/SLAT-Connector SMD.lbr"
 UsedLibrary="C:/Users/mkroening/Documents/eagle/seniordesign-hardware/lbr/SLAT-Connector TH.lbr"
 UsedLibrary="C:/Users/mkroening/Documents/eagle/seniordesign-hardware/lbr/SparkFun.lbr"
 UsedLibrary="C:/Users/ethanzonca/Documents/eagle/seniordesign-hardware/lbr/SeniorDesign.lbr"
 [Win_1]
 Type="Control Panel"
 Loc="306 94 1133 634"
 State=2
 Loc="-3 385 596 784"
 State=0
 Number=0
 [Desktop]
 Screen="1280 1024"
 Window="Win_1"

0 comments (0 inline, 0 general)