Skip to content
Snippets Groups Projects
Commit 4a4cb7ab authored by Adam Mokhtari's avatar Adam Mokhtari
Browse files

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

Conflicts:
	Builds/MacOSX/open-ephys.xcodeproj/project.pbxproj
	JuceLibraryCode/BinaryData.cpp
	JuceLibraryCode/JuceHeader.h
parents 2dc0abba 15582fa4
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 699 additions and 401 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment