Merge commit 'f80ae40d'
Conflicts: moose-core/python/setup.cmake.py
No related branches found
No related tags found
Showing
- moose-core/.travis/travis_build_osx.sh 6 additions, 2 deletionsmoose-core/.travis/travis_build_osx.sh
- moose-core/.travis/travis_prepare_osx.sh 8 additions, 6 deletionsmoose-core/.travis/travis_prepare_osx.sh
- moose-core/CMakeLists.txt 6 additions, 3 deletionsmoose-core/CMakeLists.txt
- moose-core/basecode/Id.h 9 additions, 0 deletionsmoose-core/basecode/Id.h
- moose-core/basecode/header.h 1 addition, 0 deletionsmoose-core/basecode/header.h
- moose-core/biophysics/CompartmentBase.cpp 11 additions, 0 deletionsmoose-core/biophysics/CompartmentBase.cpp
- moose-core/biophysics/Neuron.cpp 4 additions, 0 deletionsmoose-core/biophysics/Neuron.cpp
- moose-core/ksolve/ZombieEnz.cpp 12 additions, 6 deletionsmoose-core/ksolve/ZombieEnz.cpp
- moose-core/mesh/NeuroMesh.cpp 1 addition, 0 deletionsmoose-core/mesh/NeuroMesh.cpp
- moose-core/mesh/NeuroNode.cpp 35 additions, 5 deletionsmoose-core/mesh/NeuroNode.cpp
- moose-core/mesh/NeuroNode.h 1 addition, 1 deletionmoose-core/mesh/NeuroNode.h
- moose-core/mesh/SpineMesh.cpp 1 addition, 0 deletionsmoose-core/mesh/SpineMesh.cpp
- moose-core/python/rdesigneur/rdesigneur.py 7 additions, 7 deletionsmoose-core/python/rdesigneur/rdesigneur.py
- moose-core/python/setup.cmake.py 1 addition, 23 deletionsmoose-core/python/setup.cmake.py
Please register or sign in to comment