Merge branch 'development' into load-audio-settings

Author: ethanbb

.gitignore

@@ -33,6 +33,7 @@ PluginGenerator/Builds/VisualStudio2013/*.user
 PluginGenerator/Builds/VisualStudio2013/*.sdf
 PluginGenerator/Builds/VisualStudio2013/*.opensdf
 PluginGenerator/Builds/VisualStudio2013/*.suo
+Projucer/**/build
 
 # 3. extra files
 Builds/Linux/build/data
@@ -98,6 +99,8 @@ Builds/VisualStudio2013/Plugins/Debug
 Builds/VisualStudio2013/Plugins/Release
 Builds/VisualStudio2013/Plugins/x64
 
+
+
 # 5. Miscellanous generated files (Doxygen, etc.)
 Source/Docs/*
 
@@ -151,8 +154,16 @@ xcuserdata/
 PluginGenerator/Builds/MacOSX/OpenEphys_PluginGenerator.xcodeproj/project.xcworkspace/contents.xcworkspacedata
 
 # 9. Plugin build dirs
-build/
+Builds/**/build/
 
 /Builds/MacOSX/Plugins/Config/Env.xcconfig
 #10. git conflict resolution files
 *.orig
+
+#11. Cmake autogenerated files
+JuceLibraryCode/JuceHeader.h
+Resources/Build-files/resources.rc
+Resources/Build-files/Info-App.plist
+
+#12. installed commonlibs
+installed_libs

Build/.gitignore

@@ -0,0 +1,3 @@
+*
+!.gitignore
+