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

@@ @@ -246,114 +246,107 @@ UsedLibrary="C:/Program Files (x86)/EAGL @@
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/optocoupler.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/pal.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/philips-semiconductors.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/photo-elements.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/piher.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/pinhead.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/plcc-socket.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/pld-intel.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/plxtech.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/pot-vitrohm.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/pot-xicor.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/pot.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/ptc-ntc.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/quantum-research-group.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/rcl.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/recom-international.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/rectifier.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/ref-packages-longpad.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/ref-packages.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/relay.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/renesas.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/resistor-bourns.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/resistor-dil.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/resistor-net.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/resistor-power.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/resistor-ruf.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/resistor-shunt.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/resistor-sil.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/resistor.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/rf-micro-devices.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/rf-solutions.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/rohm.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/semicon-smd-ipc.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/sensor-comus-group.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/sensor-heraeus.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/sensor-infratec.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/sharp.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/silabs.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/sim-technology.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/sipex.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/smd-ipc.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/smd-special.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/solomon-systech.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/solpad.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/special-drill.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/special.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/st-microelectronics.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/supertex.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/supply1.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/supply2.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/switch-alps.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/switch-coto.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/switch-dil.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/switch-misc.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/switch-omron.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/switch-raychem.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/switch-reed.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/switch.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/telcom.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/telecontrolli.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/telefunken.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/testpad.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/texas-sn55-sn75.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/texas.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/toshiba.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/traco-electronic.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/trafo-bei.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/trafo-hammondmfg.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/trafo-siemens.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/trafo-xicon.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/trafo.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/transformer-pulse.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/transistor-fet.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/transistor-neu-to92.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/transistor-npn.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/transistor-pnp.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/transistor-power.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/transistor-small-signal.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/transistor.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/triac.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/trimble.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/tripas.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/u-blox.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/uln-udn.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/v-reg-micrel.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/v-reg.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/varistor.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/wafer-scale-psd.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/wirepad.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/xicor.lbr"
 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)