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

c82fd9d5

Commit c82fd9d5 authored 7 years ago by Aaron Cuevas Lopez

Downloads
- Plain Diff

Merge branch 'testing' into development

parents 0660702d 6d5ec900

Branches

Tags

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

Builds/Linux/Makefile 3 additions, 3 deletions

Builds/Linux/Makefile
Builds/MacOSX/Info-App.plist 2 additions, 2 deletions

Builds/MacOSX/Info-App.plist
Builds/MacOSX/open-ephys.xcodeproj/project.pbxproj 4 additions, 4 deletions

Builds/MacOSX/open-ephys.xcodeproj/project.pbxproj
Builds/VisualStudio2012/open-ephys.vcxproj 8 additions, 8 deletions

Builds/VisualStudio2012/open-ephys.vcxproj
Builds/VisualStudio2012/resources.rc 3 additions, 3 deletions

Builds/VisualStudio2012/resources.rc
Builds/VisualStudio2013/open-ephys.vcxproj 8 additions, 8 deletions

Builds/VisualStudio2013/open-ephys.vcxproj
Builds/VisualStudio2013/resources.rc 3 additions, 3 deletions

Builds/VisualStudio2013/resources.rc
JuceLibraryCode/JuceHeader.h 2 additions, 2 deletions

JuceLibraryCode/JuceHeader.h
Source/Processors/RecordNode/OriginalRecording.cpp 26 additions, 46 deletions

Source/Processors/RecordNode/OriginalRecording.cpp
Source/Processors/RecordNode/OriginalRecording.h 0 additions, 2 deletions

Source/Processors/RecordNode/OriginalRecording.h
open-ephys.jucer 1 addition, 1 deletion

open-ephys.jucer

with 60 additions and 82 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