Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

P

plugin-GUI
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

58b1d6b9

Commit 58b1d6b9 authored 9 years ago by Aaron Cuevas Lopez

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/master' into mastermerge

parents 192b6532 a23cc9d6

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

Source/Plugins/BasicSpikeDisplay/SpikeDetector/SpikeDetector.cpp 17 additions, 7 deletions

...Plugins/BasicSpikeDisplay/SpikeDetector/SpikeDetector.cpp
Source/Plugins/BasicSpikeDisplay/SpikeDetector/SpikeDetector.h 6 additions, 4 deletions

...e/Plugins/BasicSpikeDisplay/SpikeDetector/SpikeDetector.h
Source/Plugins/BasicSpikeDisplay/SpikeDetector/SpikeDetectorEditor.cpp 3 additions, 3 deletions

...s/BasicSpikeDisplay/SpikeDetector/SpikeDetectorEditor.cpp
Source/Plugins/BasicSpikeDisplay/SpikeDetector/SpikeDetectorEditor.h 1 addition, 1 deletion

...ins/BasicSpikeDisplay/SpikeDetector/SpikeDetectorEditor.h
Source/Plugins/LfpDisplayNode/LfpDisplayNode.cpp 1 addition, 1 deletion

Source/Plugins/LfpDisplayNode/LfpDisplayNode.cpp
Source/Plugins/LfpDisplayNode/LfpDisplayNode.h 1 addition, 1 deletion

Source/Plugins/LfpDisplayNode/LfpDisplayNode.h

with 29 additions and 17 deletions

Loading

0% Loading 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