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

Source/Processors/Visualization/LfpDisplayCanvas.cpp

@@ -334,7 +334,7 @@ void LfpDisplayCanvas::refresh()
 
     lfpDisplay->refresh();
 
-    getPeer()->performAnyPendingRepaintsNow();
+    //getPeer()->performAnyPendingRepaintsNow();
 
 }
 

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).