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

1df0e8c8

Commit 1df0e8c8 authored 11 years ago by Josh Siegle

Downloads
- Plain Diff

Merge from GitHub

parents c150c576 4eaed8c6

No related branches found

No related tags found

No related merge requests found

Changes 11

Expand all Hide whitespace changes

Inline Side-by-side

Showing

Builds/Linux/Makefile 2 additions, 2 deletions

Builds/Linux/Makefile
Builds/MacOSX/open-ephys.xcodeproj/project.pbxproj 2855 additions, 3704 deletions

Builds/MacOSX/open-ephys.xcodeproj/project.pbxproj
Builds/VisualStudio2012/open-ephys.sln 13 additions, 5 deletions

Builds/VisualStudio2012/open-ephys.sln
Builds/VisualStudio2012/open-ephys.vcxproj 766 additions, 767 deletions

Builds/VisualStudio2012/open-ephys.vcxproj
Builds/VisualStudio2012/open-ephys.vcxproj.filters 2 additions, 78 deletions

Builds/VisualStudio2012/open-ephys.vcxproj.filters
Source/Processors/DataThreads/RHD2000Thread.cpp 8 additions, 6 deletions

Source/Processors/DataThreads/RHD2000Thread.cpp
Source/Processors/Editors/LfpTriggeredAverageEditor.cpp 2 additions, 2 deletions

Source/Processors/Editors/LfpTriggeredAverageEditor.cpp
Source/Processors/Editors/RHD2000Editor.cpp 2 additions, 2 deletions

Source/Processors/Editors/RHD2000Editor.cpp
Source/Processors/Editors/RHD2000Editor.h 2 additions, 2 deletions

Source/Processors/Editors/RHD2000Editor.h
Source/Processors/Serial/PulsePal.cpp 11 additions, 1 deletion

Source/Processors/Serial/PulsePal.cpp
open-ephys.jucer 3 additions, 3 deletions

open-ephys.jucer

with 3666 additions and 4572 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