Merge branch 'master' into Development-of-Analysis-GUI
- Conflicts:
- Plotting/EventPlots.py
Description
Description
Details
Details
- Committed
Microtubulus <michael.graf> Jun 14 2019, 11:04 - Pushed
grafm Jun 14 2019, 11:06 - Parents
- rNPTOOLSf905f230b58c: Merge branch 'Development-of-Analysis-GUI' of https://c4science.
rNPTOOLS62e380e32bf3: Moved sorting - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 62e380e32bf3 | deen | Moved sorting | Jun 12 2019 | |||
| 6b675b7de877 | deen | Minor cosmetic changes | Jun 12 2019 | |||
| e7f6ab17a17f | deen | Modified MakeIndividualIVs | Jun 12 2019 | |||
| 3b8380e96bc8 | deen | Minor changes for plotting Bokeh in Jupyter | Jun 12 2019 | |||
| e377aa3ddf2c | deen | sort Voltages | Jun 12 2019 | |||
| aeb2d8e44532 | deen | changed variable name | Jun 12 2019 | |||
| 34c4670c4cf8 | deen | Merge remote-tracking branch 'origin/master' | Jun 12 2019 | |||
| 90792c965edb | deen | disabled nonfitted events by default | Jun 12 2019 |