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

71eb1105

Commit 71eb1105 authored 8 years ago by Aaron Cuevas Lopez

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/development' into NWB

parents 71d995bd b92f02aa

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

Builds/MacOSX/OpenEphys.xcworkspace/xcshareddata/xcschemes/All.xcscheme 20 additions, 1 deletion

...OpenEphys.xcworkspace/xcshareddata/xcschemes/All.xcscheme
Builds/MacOSX/Plugins/Config/Plugin.xcconfig 26 additions, 2 deletions

Builds/MacOSX/Plugins/Config/Plugin.xcconfig
Builds/MacOSX/open-ephys.xcodeproj/xcshareddata/xcschemes/open-ephys (App).xcscheme 110 additions, 0 deletions

...codeproj/xcshareddata/xcschemes/open-ephys (App).xcscheme
Source/Processors/DataThreads/RhythmNode/RHD2000Editor.cpp 2 additions, 1 deletion

Source/Processors/DataThreads/RhythmNode/RHD2000Editor.cpp
Source/Processors/DataThreads/RhythmNode/RHD2000Thread.cpp 2 additions, 2 deletions

Source/Processors/DataThreads/RhythmNode/RHD2000Thread.cpp

with 160 additions and 6 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