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

9ac5acb0

Commit 9ac5acb0 authored 10 years ago by Aaron Cuevas Lopez

Downloads
- Plain Diff

Merge branch 'master' into filereader

Conflicts:
	Builds/VisualStudio2013/open-ephys.vcxproj

parents 9589649c d0113186

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

Builds/VisualStudio2012/open-ephys.sln 5 additions, 13 deletions

Builds/VisualStudio2012/open-ephys.sln
Resources/DLLs/InstallEcubeApi_0_11.exe 0 additions, 0 deletions

Resources/DLLs/InstallEcubeApi_0_11.exe
Resources/DLLs/InstallEcubeApi_0_12.exe 0 additions, 0 deletions

Resources/DLLs/InstallEcubeApi_0_12.exe
Source/Processors/ChannelMappingNode/ChannelMappingEditor.cpp 1 addition, 0 deletions

...ce/Processors/ChannelMappingNode/ChannelMappingEditor.cpp
Source/Processors/ChannelMappingNode/ChannelMappingNode.cpp 20 additions, 1 deletion

Source/Processors/ChannelMappingNode/ChannelMappingNode.cpp
Source/Processors/DataThreads/EcubeThread.cpp 57 additions, 1 deletion

Source/Processors/DataThreads/EcubeThread.cpp
Source/Processors/DataThreads/EcubeThread.h 3 additions, 0 deletions

Source/Processors/DataThreads/EcubeThread.h
Source/Processors/LfpDisplayNode/LfpDisplayCanvas.cpp 22 additions, 0 deletions

Source/Processors/LfpDisplayNode/LfpDisplayCanvas.cpp
Source/Processors/LfpDisplayNode/LfpDisplayCanvas.h 2 additions, 0 deletions

Source/Processors/LfpDisplayNode/LfpDisplayCanvas.h

with 110 additions and 15 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