diff options
Diffstat (limited to 'kicadSchematicLibrary/kicad.pro')
| -rw-r--r-- | kicadSchematicLibrary/kicad.pro | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/kicadSchematicLibrary/kicad.pro b/kicadSchematicLibrary/kicad.pro index afdcf2d3..e2569a1f 100644 --- a/kicadSchematicLibrary/kicad.pro +++ b/kicadSchematicLibrary/kicad.pro @@ -40,6 +40,36 @@ LibName6=eSim_Power LibName7=eSim_Sources LibName8=eSim_Subckt LibName9=eSim_User +<<<<<<< HEAD +LibName10=adc-dac +LibName11=memory +LibName12=xilinx +LibName13=microcontrollers +LibName14=dsp +LibName15=microchip +LibName16=analog_switches +LibName17=motorola +LibName18=texas +LibName19=intel +LibName20=audio +LibName21=interface +LibName22=digital-audio +LibName23=philips +LibName24=display +LibName25=cypress +LibName26=siliconi +LibName27=opto +LibName28=atmel +LibName29=contrib +LibName30=power +LibName31=device +LibName32=transistors +LibName33=conn +LibName34=linear +LibName35=regul +LibName36=74xx +LibName37=cmos4000 +======= LibName10=eSim_Plot LibName11=adc-dac LibName12=memory @@ -69,3 +99,4 @@ LibName35=linear LibName36=regul LibName37=74xx LibName38=cmos4000 +>>>>>>> develop |