1. 05 Jun, 2020 4 commits
  2. 04 Jun, 2020 3 commits
  3. 02 Jun, 2020 1 commit
  4. 01 Jun, 2020 1 commit
  5. 31 May, 2020 1 commit
  6. 30 May, 2020 2 commits
  7. 29 May, 2020 7 commits
  8. 28 May, 2020 1 commit
  9. 27 May, 2020 3 commits
  10. 26 May, 2020 2 commits
  11. 25 May, 2020 1 commit
  12. 23 May, 2020 1 commit
  13. 21 May, 2020 6 commits
  14. 20 May, 2020 3 commits
  15. 15 May, 2020 2 commits
  16. 13 May, 2020 1 commit
  17. 12 May, 2020 1 commit
    • Aaron Bray's avatar
      Merge branch '3.x' into feature/hemorhagic_shock · a14d53ef
      Aaron Bray authored
      Added serialization support for all new Nervous variables
      
      # Conflicts:
      #	cdm/cpp/properties/SEScalar.cpp
      #	cdm/cpp/properties/SEScalar.h
      #	cdm/cpp/utils/ConfigParser.cpp
      #	cdm/cpp/utils/DataTrack.cpp
      #	cdm/java/com/kitware/physiology/utilities/csv/CSVContents.java
      #	data/Data.xlsx
      #	engine/cpp/controller/Controller.cpp
      #	engine/cpp/controller/Engine.cpp
      #	engine/cpp/controller/Substances.cpp
      #	engine/cpp/physiology/BloodChemistry.cpp
      #	engine/cpp/physiology/Cardiovascular.cpp
      #	engine/cpp/physiology/Cardiovascular.h
      #	engine/cpp/physiology/Gastrointestinal.cpp
      #	engine/cpp/physiology/Nervous.cpp
      #	engine/cpp/physiology/Nervous.h
      #	engine/cpp/physiology/Renal.cpp
      #	engine/cpp/physiology/Saturation.cpp
      #	engine/cpp/physiology/Tissue.cpp
      #	engine/cpp/physiology/Tissue.h
      #	test/config/DebugRun.config
      #	test/config/PatientVerification.config
      #	test/config/ScenarioVerification.config
      #	test/driver/cpp/main.cpp
      #	test/scenarios/patient/BasicStandard.json
      a14d53ef