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

Author: Josh Siegle

Builds/Linux/Makefile

@@ -117,6 +117,8 @@ OBJECTS := \
   $(OBJDIR)/DataWindow_83ce6754.o \
   $(OBJDIR)/SpikeObject_24e8c655.o \
   $(OBJDIR)/MatlabLikePlot_fb09c37f.o \
+  $(OBJDIR)/ButtonGroupManager_75d0fbfa.o \
+  $(OBJDIR)/MaterialButtonLookAndFeel_d7d19ba2.o \
   $(OBJDIR)/MaterialSliderLookAndFeel_c97dd613.o \
   $(OBJDIR)/CustomLookAndFeel_fcb2406a.o \
   $(OBJDIR)/CustomArrowButton_206e4278.o \
@@ -494,6 +496,16 @@ $(OBJDIR)/MatlabLikePlot_fb09c37f.o: ../../Source/Processors/Visualization/Matla
 	@echo "Compiling MatlabLikePlot.cpp"
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
+$(OBJDIR)/ButtonGroupManager_75d0fbfa.o: ../../Source/UI/Utils/ButtonGroupManager.cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling ButtonGroupManager.cpp"
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+
+$(OBJDIR)/MaterialButtonLookAndFeel_d7d19ba2.o: ../../Source/UI/LookAndFeel/MaterialButtonLookAndFeel.cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling MaterialButtonLookAndFeel.cpp"
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+
 $(OBJDIR)/MaterialSliderLookAndFeel_c97dd613.o: ../../Source/UI/LookAndFeel/MaterialSliderLookAndFeel.cpp
 	-@mkdir -p $(OBJDIR)
 	@echo "Compiling MaterialSliderLookAndFeel.cpp"

Builds/MacOSX/.gitignore

@@ -0,0 +1 @@
+xcuserdata/