Merge branch 'master' into dilawar-patch-1 (946efbb0) · Commits · Sahil Moza / moose · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

M

moose
- Activity
- Members
- Labels
- Issues
  9
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

946efbb0

Unverified Commit 946efbb0 authored 6 years ago by

Dilawar Singh Committed by GitHub 6 years ago

Downloads
- Plain Diff

Merge branch 'master' into dilawar-patch-1

parents bc063944 049a52f2

No related branches found

No related tags found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

moose-core/diffusion/Dsolve.cpp 7 additions, 3 deletions

moose-core/diffusion/Dsolve.cpp
moose-core/kinetics/ReadKkit.cpp 1 addition, 0 deletions

moose-core/kinetics/ReadKkit.cpp
moose-core/mesh/EndoMesh.cpp 5 additions, 2 deletions

moose-core/mesh/EndoMesh.cpp
moose-core/python/moose/SBML/readSBML.py 7 additions, 3 deletions

moose-core/python/moose/SBML/readSBML.py
moose-core/python/moose/SBML/writeSBML.py 46 additions, 19 deletions

moose-core/python/moose/SBML/writeSBML.py
moose-core/python/moose/genesis/writeKkit.py 99 additions, 24 deletions

moose-core/python/moose/genesis/writeKkit.py
moose-core/python/moose/moose.py 4 additions, 4 deletions

moose-core/python/moose/moose.py
moose-core/python/moose/neuroml2/reader.py 22 additions, 24 deletions

moose-core/python/moose/neuroml2/reader.py
moose-core/python/rdesigneur/rdesigneur.py 3 additions, 4 deletions

moose-core/python/rdesigneur/rdesigneur.py
moose-core/python/rdesigneur/rdesigneurProtos.py 3 additions, 2 deletions

moose-core/python/rdesigneur/rdesigneurProtos.py
moose-core/tests/python/test_Xchan1.py 1 addition, 1 deletion

moose-core/tests/python/test_Xchan1.py

with 198 additions and 86 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment