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

eb25a003 · jsiegle · c3192ee4 · 51eae5db · eb25a003 · eb25a003
Commit eb25a003 authored 11 years ago by jsiegle
--- a/Builds/MacOSX/open-ephys.xcodeproj/project.pbxproj
+++ b/Builds/MacOSX/open-ephys.xcodeproj/project.pbxproj
--- a/Builds/MacOSX/open-ephys.xcodeproj/project.xcworkspace/xcuserdata/Josh.xcuserdatad/UserInterfaceState.xcuserstate
+++ b/Builds/MacOSX/open-ephys.xcodeproj/project.xcworkspace/xcuserdata/Josh.xcuserdatad/UserInterfaceState.xcuserstate
--- a/Source/Processors/Visualization/LfpDisplayCanvas.cpp
+++ b/Source/Processors/Visualization/LfpDisplayCanvas.cpp
@@ -334,7 +334,7 @@ void LfpDisplayCanvas::refresh()
    lfpDisplay->refresh();
-    getPeer()->performAnyPendingRepaintsNow();
+    //getPeer()->performAnyPendingRepaintsNow();
 }

--- a/astyle.options
+++ b/astyle.options
@@ -13,8 +13,6 @@
 #  astyle --options="../astyle.options" "./*"
 #
-#  Special note to Josh: move Docs out of Source, or add --exclude="Docs"?
 #  The above commands will format the entire source tree using a style which
 #  mostly conforms to that of the Juce library
 #  (www.juce.com/wiki/index.php/Coding_Standards).