Skip to content
Snippets Groups Projects
  • Dilawar Singh's avatar
    Squashed 'moose-core/' changes from e5ba823ba..33d4803ee · 6f7697fb
    Dilawar Singh authored
    33d4803ee Merge pull request #228 from upibhalla/master
    c9e9fa6fd Update test_muparser.py
    419661b6e Update test_muparser.py
    7c8ca61a6 Merge branch 'master' of https://github.com/upibhalla/moose-core
    b13fc98cc Fix for muparser tests
    7eefdca47 Merge branch 'master' into master
    1ad271b07 Merge pull request #229 from dilawar/master
    30fe94cda Optimizations for rdesigneur in _parseComptField function
    d862de4e9 Merge branch 'master' of https://github.com/BhallaLab/moose-core
    3eef327f1 Added instructions on what to do post-build.
    985af4e11 Fixes BhallaLab/moose#224 and BhallaLab/moose-core#230 .
    917d68db0 Merge branch 'master' of github.com:BhallaLab/moose-core
    586d48a62 Merge pull request #222 from hrani/master
    3c7ce10fa New line added
    e7c8d0e81 Merge branch 'master' of http://github.com/hrani/moose-core
    7ce91a0f2 import rdesigneur.rmoogli as rmoogli is added at init file, otherwise script that uses rmoogli gives and error "NameError: global name \'rmoogli\' is not defined"
    fd5f360d6 Merge branch 'master' of https://github.com/BhallaLab/moose-core
    eb76ab120 Fix to Neuron.cpp handling of messages between Ca channels and Ca_conc objects.
    f9f188513 Merge branch 'master' into master
    67c9b0a85 Disabled seg-fault causing test on python3. Runs with python2.
    cd40023f2 disable seg-fault causing function on python3.
    761172460 Merge branch 'master' into master
    946cb77e7 call plotDEGF only once.
    47f6803df iteritems( ) is no longer supported by python3; replacing it with items().
    f447f0d35 Passes with python3.4 .
    1d26f38c2 import matplotlib in rdesigneur.display only when display is called.
    4b56d7a66 dependencies are handled by cmake now. Removing scripts.
    20c131a3f Added field Table::plotDump to substitute for the Table::xplot function which has problems with Moose interface to Python.
    2c7b9efc9 Merge branch 'master' into master
    8005f2f04 loading SBML was commented, now uncommenting while mergering
    
    git-subtree-dir: moose-core
    git-subtree-split: 33d4803eed211af61fd8b6f45d71e8675f77f951
    6f7697fb