Skip to content

Commit dbcd7ff

Browse files
committed
Merge branch 'development' of https://github.com/open-ephys/plugin-GUI into development
2 parents 0f94b1f + 778a205 commit dbcd7ff

54 files changed

Lines changed: 4530 additions & 155 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Builds/MacOSX/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
xcuserdata/

Builds/MacOSX/Makefile.plugins

Lines changed: 0 additions & 71 deletions
This file was deleted.

Builds/MacOSX/OpenEphys.xcworkspace/contents.xcworkspacedata

Lines changed: 56 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)