From 206afcded42d55572509e3439d752c9a81c84785 Mon Sep 17 00:00:00 2001
From: Fahim
Date: Wed, 30 Dec 2015 12:31:05 +0530
Subject: Added : 1. Power Examples 2. eSim_Power.lib 3. DeviceModel for
 Powerdiode and Zenerdiode 4. Subcicuit for scr, diac, triac

---
 kicadSchematicLibrary/kicad.pro | 63 +++++++++++++++++++++--------------------
 1 file changed, 32 insertions(+), 31 deletions(-)

(limited to 'kicadSchematicLibrary/kicad.pro')

diff --git a/kicadSchematicLibrary/kicad.pro b/kicadSchematicLibrary/kicad.pro
index ca36a197..b3b4672e 100644
--- a/kicadSchematicLibrary/kicad.pro
+++ b/kicadSchematicLibrary/kicad.pro
@@ -36,34 +36,35 @@ LibName2=eSim_Devices
 LibName3=eSim_Digital
 LibName4=eSim_Hybrid
 LibName5=eSim_Miscellaneous
-LibName6=eSim_Sources
-LibName7=eSim_Subckt
-LibName8=eSim_User
-LibName9=adc-dac
-LibName10=memory
-LibName11=xilinx
-LibName12=microcontrollers
-LibName13=dsp
-LibName14=microchip
-LibName15=analog_switches
-LibName16=motorola
-LibName17=texas
-LibName18=intel
-LibName19=audio
-LibName20=interface
-LibName21=digital-audio
-LibName22=philips
-LibName23=display
-LibName24=cypress
-LibName25=siliconi
-LibName26=opto
-LibName27=atmel
-LibName28=contrib
-LibName29=power
-LibName30=device
-LibName31=transistors
-LibName32=conn
-LibName33=linear
-LibName34=regul
-LibName35=74xx
-LibName36=cmos4000
+LibName6=eSim_Power
+LibName7=eSim_Sources
+LibName8=eSim_Subckt
+LibName9=eSim_User
+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
-- 
cgit 


From f4d9082f5f217db6e592cf67c5add1170ec57c04 Mon Sep 17 00:00:00 2001
From: Fahim
Date: Wed, 17 Feb 2016 17:14:07 +0530
Subject: Remove Conflict

---
 kicadSchematicLibrary/kicad.pro | 2 --
 1 file changed, 2 deletions(-)

(limited to 'kicadSchematicLibrary/kicad.pro')

diff --git a/kicadSchematicLibrary/kicad.pro b/kicadSchematicLibrary/kicad.pro
index e2569a1f..7c43d64d 100644
--- a/kicadSchematicLibrary/kicad.pro
+++ b/kicadSchematicLibrary/kicad.pro
@@ -40,7 +40,6 @@ LibName6=eSim_Power
 LibName7=eSim_Sources
 LibName8=eSim_Subckt
 LibName9=eSim_User
-<<<<<<< HEAD
 LibName10=adc-dac
 LibName11=memory
 LibName12=xilinx
@@ -99,4 +98,3 @@ LibName35=linear
 LibName36=regul
 LibName37=74xx
 LibName38=cmos4000
->>>>>>> develop
-- 
cgit