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

c19e7fc9

Commit c19e7fc9 authored 7 years ago by Aaron Cuevas Lopez

Downloads
- Plain Diff

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

parents d224b0e0 744e2e83

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

Builds/MacOSX/OpenEphys.xcworkspace/contents.xcworkspacedata 0 additions, 3 deletions

Builds/MacOSX/OpenEphys.xcworkspace/contents.xcworkspacedata
Builds/MacOSX/Plugins/CommonLibs/OpenEphysHDF5/OpenEphysHDF5.xcodeproj/project.pbxproj 2 additions, 0 deletions

...ibs/OpenEphysHDF5/OpenEphysHDF5.xcodeproj/project.pbxproj
Builds/MacOSX/Plugins/Config/Plugin.xcconfig 2 additions, 0 deletions

Builds/MacOSX/Plugins/Config/Plugin.xcconfig
Builds/MacOSX/Plugins/KWIKFormat/KWIKFormat.xcodeproj/project.pbxproj 18 additions, 0 deletions

...X/Plugins/KWIKFormat/KWIKFormat.xcodeproj/project.pbxproj
Source/Processors/Channel/InfoObjects.cpp 18 additions, 0 deletions

Source/Processors/Channel/InfoObjects.cpp
Source/Processors/Channel/InfoObjects.h 9 additions, 3 deletions

Source/Processors/Channel/InfoObjects.h
Source/Processors/Channel/MetaData.cpp 7 additions, 1 deletion

Source/Processors/Channel/MetaData.cpp
Source/Processors/Channel/MetaData.h 3 additions, 0 deletions

Source/Processors/Channel/MetaData.h
Source/Processors/DataThreads/RhythmNode/RHD2000Thread.cpp 1 addition, 0 deletions

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

Source/Processors/FileReader/FileReader.cpp
Source/Processors/GenericProcessor/GenericProcessor.cpp 2 additions, 2 deletions

Source/Processors/GenericProcessor/GenericProcessor.cpp

with 64 additions and 11 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