Skip to content
Snippets Groups Projects
  1. Sep 26, 2014
  2. Sep 25, 2014
  3. Sep 24, 2014
  4. Sep 23, 2014
  5. Sep 22, 2014
  6. Sep 21, 2014
  7. Sep 20, 2014
  8. Sep 19, 2014
  9. Sep 18, 2014
  10. Sep 16, 2014
    • Aaron Cuevas Lopez's avatar
      Fix merge error · a626ea13
      Aaron Cuevas Lopez authored
      a626ea13
    • Aaron Cuevas Lopez's avatar
      Merge branch 'master' into hdf5 · 69ffe832
      Aaron Cuevas Lopez authored
      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
      69ffe832
    • jsiegle's avatar
      It's actually an Expander, folks · 971ca63c
      jsiegle authored
      971ca63c
Loading