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