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

310afa4c

Commit 310afa4c authored 8 years ago by Galen Lynch

Downloads
- Plain Diff

Merge branch 'development' into fix-audiomonitor-offset

parents e5dd51fc 5cfdd9c3

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

Builds/VisualStudio2013/open-ephys.sln 15 additions, 5 deletions

Builds/VisualStudio2013/open-ephys.sln
Source/Processors/Editors/VisualizerEditor.h 7 additions, 0 deletions

Source/Processors/Editors/VisualizerEditor.h
Source/Processors/Parameter/Parameter.cpp 4 additions, 4 deletions

Source/Processors/Parameter/Parameter.cpp
Source/Processors/Parameter/Parameter.h 3 additions, 3 deletions

Source/Processors/Parameter/Parameter.h

with 29 additions and 12 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