Merge branch 'release/v1.2.0'

gbmhunter · Apr 24, 2016 · 6ea8223 · 6ea8223
2 parents 675bab2 + 0906207
commit 6ea8223
Show file tree

Hide file tree

Showing 85 changed files with 7,083 additions and 2,015 deletions.
diff --git a/.idea/artifacts/NinjaCalc_jar.xml b/.idea/artifacts/NinjaCalc_jar.xml
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/libraries/org_scilab_forge_jlatexmath_1_0_2.xml b/.idea/libraries/org_scilab_forge_jlatexmath_1_0_2.xml
diff --git a/.idea/libraries/symja_java8_2016_04_15.xml b/.idea/libraries/symja_java8_2016_04_15.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/NinjaCalc.iml b/NinjaCalc.iml
@@ -10,5 +10,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="org.testfx:testfx-core:4.0.2-alpha" level="project" />
     <orderEntry type="library" name="org.testfx:testfx-junit:4.0.2-alpha" level="project" />
+    <orderEntry type="library" name="symja_java8-2016-04-15" level="project" />
+    <orderEntry type="library" name="org.scilab.forge:jlatexmath:1.0.2" level="project" />
   </component>
 </module>