Merge branch 'develop'

matthiaskoenig · Jul 11, 2016 · 1a1e0b5 · 1a1e0b5
2 parents 890e802 + eef7de6
commit 1a1e0b5
Show file tree

Hide file tree

Showing 189 changed files with 58,745 additions and 744 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,5 @@ cy3sbml.log
 /target/maven-status/
 /target/test-classes
 /target/
+.idea/
+.idea/workspace.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/libraries/Maven__axis_axis_1_4.xml b/.idea/libraries/Maven__axis_axis_1_4.xml
diff --git a/.idea/libraries/Maven__axis_axis_wsdl4j_1_5_1.xml b/.idea/libraries/Maven__axis_axis_wsdl4j_1_5_1.xml
diff --git a/.idea/libraries/Maven__com_fasterxml_staxmate_staxmate_2_3_0.xml b/.idea/libraries/Maven__com_fasterxml_staxmate_staxmate_2_3_0.xml
diff --git a/.idea/libraries/Maven__com_fasterxml_woodstox_woodstox_core_5_0_1.xml b/.idea/libraries/Maven__com_fasterxml_woodstox_woodstox_core_5_0_1.xml
diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_7.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_7.xml
diff --git a/.idea/libraries/Maven__com_google_guava_guava_r09.xml b/.idea/libraries/Maven__com_google_guava_guava_r09.xml
diff --git a/.idea/libraries/Maven__com_mashape_unirest_unirest_java_1_4_9.xml b/.idea/libraries/Maven__com_mashape_unirest_unirest_java_1_4_9.xml
diff --git a/.idea/libraries/Maven__com_sun_jdmk_jmxtools_1_2_1.xml b/.idea/libraries/Maven__com_sun_jdmk_jmxtools_1_2_1.xml
diff --git a/.idea/libraries/Maven__com_sun_jmx_jmxri_1_2_1.xml b/.idea/libraries/Maven__com_sun_jmx_jmxri_1_2_1.xml
diff --git a/.idea/libraries/Maven__com_thoughtworks_xstream_xstream_1_3_1.xml b/.idea/libraries/Maven__com_thoughtworks_xstream_xstream_1_3_1.xml
diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_6.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_6.xml
diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml
diff --git a/.idea/libraries/Maven__commons_discovery_commons_discovery_0_2.xml b/.idea/libraries/Maven__commons_discovery_commons_discovery_0_2.xml
diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml
diff --git a/.idea/libraries/Maven__commons_lang_commons_lang_2_4.xml b/.idea/libraries/Maven__commons_lang_commons_lang_2_4.xml
diff --git a/.idea/libraries/Maven__commons_logging_commons_logging_1_1_3.xml b/.idea/libraries/Maven__commons_logging_commons_logging_1_1_3.xml
diff --git a/.idea/libraries/Maven__cy3sbml_dep_jsbml_1_2_SNAPSHOT.xml b/.idea/libraries/Maven__cy3sbml_dep_jsbml_1_2_SNAPSHOT.xml
diff --git a/.idea/libraries/Maven__cy3sbml_dep_jsbml_comp_1_0_b1.xml b/.idea/libraries/Maven__cy3sbml_dep_jsbml_comp_1_0_b1.xml
diff --git a/.idea/libraries/Maven__cy3sbml_dep_jsbml_distrib_0_5.xml b/.idea/libraries/Maven__cy3sbml_dep_jsbml_distrib_0_5.xml
diff --git a/.idea/libraries/Maven__cy3sbml_dep_jsbml_fbc_1_0_b1.xml b/.idea/libraries/Maven__cy3sbml_dep_jsbml_fbc_1_0_b1.xml
diff --git a/.idea/libraries/Maven__cy3sbml_dep_jsbml_groups_0_4_b1.xml b/.idea/libraries/Maven__cy3sbml_dep_jsbml_groups_0_4_b1.xml
diff --git a/.idea/libraries/Maven__cy3sbml_dep_jsbml_layout_1_0_b1.xml b/.idea/libraries/Maven__cy3sbml_dep_jsbml_layout_1_0_b1.xml
diff --git a/.idea/libraries/Maven__cy3sbml_dep_jsbml_qual_2_1_b1.xml b/.idea/libraries/Maven__cy3sbml_dep_jsbml_qual_2_1_b1.xml