diff options
Diffstat (limited to 'Examples')
| -rw-r--r-- | Examples/BJT_Biascircuit/BJT_Biascircuit.pro | 17 | ||||
| -rw-r--r-- | Examples/BJT_CB_config/BJT_CB_config.pro | 15 | ||||
| -rw-r--r-- | Examples/BJT_CE_config/BJT_CE_config.pro | 17 | ||||
| -rw-r--r-- | Examples/BJT_amplifier/BJT_amplifier.pro | 31 |
4 files changed, 0 insertions, 80 deletions
diff --git a/Examples/BJT_Biascircuit/BJT_Biascircuit.pro b/Examples/BJT_Biascircuit/BJT_Biascircuit.pro index f449ea48..6b3635f5 100644 --- a/Examples/BJT_Biascircuit/BJT_Biascircuit.pro +++ b/Examples/BJT_Biascircuit/BJT_Biascircuit.pro @@ -62,20 +62,3 @@ LibName28=opto LibName29=atmel LibName30=contrib LibName31=power -<<<<<<< HEAD -LibName32=device -LibName33=transistors -LibName34=conn -LibName35=linear -LibName36=regul -LibName37=74xx -LibName38=cmos4000 -LibName39=/home/fossee/library/eSim_Plot -======= -LibName32=eSim_Plot -LibName33=transistors -LibName34=conn -LibName35=74xx -LibName36=regul - ->>>>>>> fellowship2019-python3 diff --git a/Examples/BJT_CB_config/BJT_CB_config.pro b/Examples/BJT_CB_config/BJT_CB_config.pro index 42e7b22f..109f0cc7 100644 --- a/Examples/BJT_CB_config/BJT_CB_config.pro +++ b/Examples/BJT_CB_config/BJT_CB_config.pro @@ -63,18 +63,3 @@ LibName29=opto LibName30=atmel LibName31=contrib LibName32=power -<<<<<<< HEAD -LibName33=device -LibName34=transistors -LibName35=conn -LibName36=linear -LibName37=regul -LibName38=74xx -LibName39=cmos4000 -======= -LibName33=74xx -LibName34=transistors -LibName35=conn -LibName36=cmos4000 -LibName37=regul ->>>>>>> fellowship2019-python3 diff --git a/Examples/BJT_CE_config/BJT_CE_config.pro b/Examples/BJT_CE_config/BJT_CE_config.pro index 178e112d..c48b80e6 100644 --- a/Examples/BJT_CE_config/BJT_CE_config.pro +++ b/Examples/BJT_CE_config/BJT_CE_config.pro @@ -61,20 +61,3 @@ LibName27=opto LibName28=atmel
LibName29=contrib
LibName30=power
-<<<<<<< HEAD -LibName31=device
-LibName32=transistors
-LibName33=conn
-LibName34=linear
-LibName35=regul
-LibName36=74xx
-LibName37=cmos4000
-LibName38=eSim_Plot
-======= -LibName31=eSim_Plot
-LibName32=transistors
-LibName33=conn
-LibName34=cmos4000
-LibName35=regul
-LibName36=74xx
->>>>>>> fellowship2019-python3 diff --git a/Examples/BJT_amplifier/BJT_amplifier.pro b/Examples/BJT_amplifier/BJT_amplifier.pro index 34286d46..e6bdb8d9 100644 --- a/Examples/BJT_amplifier/BJT_amplifier.pro +++ b/Examples/BJT_amplifier/BJT_amplifier.pro @@ -16,34 +16,3 @@ LibName9=eSim_Sources LibName10=eSim_Subckt LibName11=eSim_User LibName12=power -LibName13=contrib -LibName14=transistors -LibName15=conn -LibName16=valves -LibName17=regul -LibName18=74xx -LibName19=cmos4000 -LibName20=adc-dac -LibName21=memory -LibName22=xilinx -LibName23=microcontrollers -LibName24=dsp -LibName25=microchip -LibName26=analog_switches -LibName27=motorola -LibName28=texas -LibName29=intel -LibName30=audio -LibName31=interface -LibName32=digital-audio -LibName33=philips -LibName34=display -LibName35=cypress -LibName36=siliconi -LibName37=opto -LibName38=atmel -<<<<<<< HEAD -LibName39=contrib -LibName40=valves -======= ->>>>>>> fellowship2019-python3 |