Source/UI/ProcessorList.h · 796c79fad01be9926a1e3aaa4c74d4e72f3ce7a6 · yehaojie / plugin-GUI

12 years ago

Merge branch 'master' into vs2012 · 87086e17

unknown authored 12 years ago

Conflicts:
	Builds/VisualStudio2012/open-ephys.vcxproj
	Builds/VisualStudio2012/open-ephys.vcxproj.filters
	Source/Processors/DataThreads/FPGAThread.cpp
	Source/Processors/ProcessorGraph.cpp

87086e17

History

Merge branch 'master' into vs2012

unknown authored 12 years ago

Conflicts:
	Builds/VisualStudio2012/open-ephys.vcxproj
	Builds/VisualStudio2012/open-ephys.vcxproj.filters
	Source/Processors/DataThreads/FPGAThread.cpp
	Source/Processors/ProcessorGraph.cpp