Merge commit '6f7697fb'
Showing
- moose-core/CMakeLists.txt 46 additions, 60 deletionsmoose-core/CMakeLists.txt
- moose-core/biophysics/Neuron.cpp 4 additions, 4 deletionsmoose-core/biophysics/Neuron.cpp
- moose-core/builtins/TableBase.cpp 26 additions, 0 deletionsmoose-core/builtins/TableBase.cpp
- moose-core/builtins/TableBase.h 3 additions, 0 deletionsmoose-core/builtins/TableBase.h
- moose-core/cmake_modules/FindNumPy.cmake 0 additions, 2 deletionsmoose-core/cmake_modules/FindNumPy.cmake
- moose-core/dependencies_list_script/dependencies 0 additions, 19 deletionsmoose-core/dependencies_list_script/dependencies
- moose-core/dependencies_list_script/ubuntu-dep 0 additions, 12 deletionsmoose-core/dependencies_list_script/ubuntu-dep
- moose-core/pymoose/CMakeLists.txt 12 additions, 0 deletionsmoose-core/pymoose/CMakeLists.txt
- moose-core/python/moose/SBML/readSBML.py 2 additions, 2 deletionsmoose-core/python/moose/SBML/readSBML.py
- moose-core/python/moose/chemMerge/merge.py 7 additions, 5 deletionsmoose-core/python/moose/chemMerge/merge.py
- moose-core/python/rdesigneur/__init__.py 1 addition, 0 deletionsmoose-core/python/rdesigneur/__init__.py
- moose-core/python/rdesigneur/rdesigneur.py 33 additions, 35 deletionsmoose-core/python/rdesigneur/rdesigneur.py
- moose-core/python/setup.cmake.py 85 additions, 0 deletionsmoose-core/python/setup.cmake.py
- moose-core/tests/python/abstrModelEqns9.py 1 addition, 0 deletionsmoose-core/tests/python/abstrModelEqns9.py
- moose-core/tests/python/test_muparser.py 165 additions, 167 deletionsmoose-core/tests/python/test_muparser.py
Please register or sign in to comment