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

eb25a003

Commit eb25a003 authored 11 years ago by jsiegle

Downloads
- Plain Diff

Merge branch 'juce2' of https://github.com/open-ephys/GUI into juce2

parents c3192ee4 51eae5db

No related branches found

No related tags found

Loading

Changes 4

Expand all Hide whitespace changes

Inline Side-by-side

Showing

Builds/MacOSX/open-ephys.xcodeproj/project.pbxproj 3629 additions, 2776 deletions

Builds/MacOSX/open-ephys.xcodeproj/project.pbxproj
Builds/MacOSX/open-ephys.xcodeproj/project.xcworkspace/xcuserdata/Josh.xcuserdatad/UserInterfaceState.xcuserstate 0 additions, 0 deletions

...cuserdata/Josh.xcuserdatad/UserInterfaceState.xcuserstate
Source/Processors/Visualization/LfpDisplayCanvas.cpp 1 addition, 1 deletion

Source/Processors/Visualization/LfpDisplayCanvas.cpp
astyle.options 0 additions, 2 deletions

astyle.options

with 3630 additions and 2779 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