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

d0790f2d

Commit d0790f2d authored 11 years ago by Josh Siegle

Downloads
- Plain Diff

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

parents 1df0e8c8 057f9e53

No related branches found

No related tags found

No related merge requests found

Changes 7

Expand all Hide whitespace changes

Inline Side-by-side

Showing

Builds/MacOSX/Info.plist 2 additions, 2 deletions

Builds/MacOSX/Info.plist
Builds/VisualStudio2012/open-ephys.sln 5 additions, 13 deletions

Builds/VisualStudio2012/open-ephys.sln
Builds/VisualStudio2012/open-ephys.vcxproj 763 additions, 762 deletions

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

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

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

JuceLibraryCode/JuceHeader.h
open-ephys.jucer 1 addition, 1 deletion

open-ephys.jucer

with 854 additions and 785 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