Skip to content
Snippets Groups Projects
Commit 69ffe832 authored by Aaron Cuevas Lopez's avatar Aaron Cuevas Lopez
Browse files

Merge branch 'master' into hdf5 

Conflicts:
	Builds/Linux/Makefile
	Builds/MacOSX/open-ephys.xcodeproj/project.pbxproj
	Source/Main.cpp
	Source/Processors/Channel.cpp
	Source/Processors/GenericProcessor.h
	Source/Processors/ProcessorGraph.cpp
	Source/Processors/RecordNode.cpp
	Source/Processors/RecordNode.h
	Source/Processors/SpikeDisplayNode.cpp
	Source/Processors/SpikeDisplayNode.h
	Source/Processors/Utilities/RecordControl.cpp
	Source/Processors/Visualization/DataWindow.cpp
parents 889762ea 368ea7a4
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1322 additions and 402 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment