diff options
| author | Fahim | 2016-02-17 17:00:35 +0530 |
|---|---|---|
| committer | Fahim | 2016-02-17 17:00:35 +0530 |
| commit | d634304de8022c499b1a4a23c85aa5f124539d93 (patch) | |
| tree | 9ec07da28a569b4ebc54c69eba778809457f451d /kicadSchematicLibrary/kicad.pro | |
| parent | 9b6b022edb89e14fa83c3c1d6ebf0a9f96500b1a (diff) | |
| parent | 8a6f29decb7793e678aa8492f4f8d899087f2f68 (diff) | |
| download | eSim-d634304de8022c499b1a4a23c85aa5f124539d93.tar.gz eSim-d634304de8022c499b1a4a23c85aa5f124539d93.tar.bz2 eSim-d634304de8022c499b1a4a23c85aa5f124539d93.zip | |
Merge branch 'develop'
Conflicts:
kicadSchematicLibrary/kicad.pro
src/ngspicetoModelica/__init__.py
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 |