Date: | 2012-04-18 01:31:58 (11 years 11 months ago) |
---|---|
Author: | Werner Almesberger |
Commit: | 994e3a84b04787dd348f076ffd9d9b73b0f0481d |
Message: | Merge branch 'master' of projects.qi-hardware.com:kicad-libs Conflicts: components/components.pro diff --cc components/components.pro index 7dff7b3,52bbba3..13eb200 --- a/components/components.pro +++ b/components/components.pro @@@ -120,16 -118,4 +118,17 @@@ LibName48=./dualpmosfe LibName49=./micro_usb_b LibName50=./pmosfet-gsd LibName51=./usb-a-pcb -LibName52=./con +LibName52=./dual_trans +LibName53=./ft232rl +LibName54=./opto-trans-4 +LibName55=./opto-trans-8 +LibName56=./spdt-c +LibName57=./sw4 +LibName58=./74hc04-3 +LibName59=./antenna +LibName60=./at86rf230 +LibName61=./at86rf231 +LibName62=./balun-smt6 +LibName63=./balun +LibName64=./xtal-4 ++LibName65=./con |
Branches:
master