Merge branch 'release' into develop

FOSSEE · May 26, 2016 · dab6b10 · dab6b10
2 parents 9f55715 + d065d48
commit dab6b10
Show file tree

Hide file tree

Showing 11 changed files with 13,488 additions and 246 deletions.
diff --git a/install-linux.sh b/install-linux.sh
@@ -44,6 +44,7 @@ function createConfigFile
  echo "KicadLib = %(eSim_HOME)s/kicadSchematicLibrary" >> $config_dir/$config_file
  echo "IMAGES = %(eSim_HOME)s/images" >> $config_dir/$config_file
  echo "VERSION = %(eSim_HOME)s/VERSION" >> $config_dir/$config_file
+ echo "MODELICA_MAP_JSON = %(eSim_HOME)s/src/ngspicetoModelica/Mapping.json" >> $config_dir/$config_file
 
 
 }

diff --git a/kicadSchematicLibrary/eSim_PSpice.dcm b/kicadSchematicLibrary/eSim_PSpice.dcm
@@ -0,0 +1,3 @@
+EESchema-DOCLIB Version 2.0
+#
+#End Doc Library