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 /.gitignore | |
| 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 '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -1,2 +1,3 @@ *.pyc - +esim-start.sh +esim.desktop |