Merge branch 'audiocomponent'
commit1274d6a27cf929a2b15a524d944a04b3e29f3865
authorOli Larkin <olilarkin@googlemail.com>
Wed, 21 Mar 2018 16:36:47 +0000 (21 16:36 +0000)
committerOli Larkin <olilarkin@googlemail.com>
Wed, 21 Mar 2018 16:36:47 +0000 (21 16:36 +0000)
tree478053e0bcf32930fbcfe5e30877c0e91d8f7d88
parentc16a383314612020b83d900c5ada1b8e82938816
parente5749805a8e7cdde68fe8227b69f3989a31b2c9f
Merge branch 'audiocomponent'

# Conflicts:
# IPlugExamples/IPlugChunks/IPlugChunks-app.vcxproj.user
# IPlugExamples/IPlugControls/IPlugControls-app.vcxproj.user
# IPlugExamples/IPlugConvoEngine/IPlugConvoEngine-aax.vcxproj.user
# IPlugExamples/IPlugConvoEngine/IPlugConvoEngine-rtas.vcxproj.user
# IPlugExamples/IPlugDistortion/IPlugDistortion-aax.vcxproj.user
# IPlugExamples/IPlugDistortion/IPlugDistortion-rtas.vcxproj.user
# IPlugExamples/IPlugEffect/IPlugEffect-app.vcxproj.user
# IPlugExamples/IPlugEffect/IPlugEffect.xcodeproj/project.pbxproj
# IPlugExamples/IPlugEffect/IPlugEffect.xcodeproj/xcshareddata/xcschemes/AU.xcscheme
# IPlugExamples/IPlugEffect/app_wrapper/app_main.cpp
# IPlugExamples/IPlugEffect/resources/IPlugEffect-AAX-Info.plist
# IPlugExamples/IPlugEffect/resources/IPlugEffect-AU-Info.plist
# IPlugExamples/IPlugEffect/resources/IPlugEffect-OSXAPP-Info.plist
# IPlugExamples/IPlugEffect/resources/IPlugEffect-RTAS-Info.plist
# IPlugExamples/IPlugEffect/resources/IPlugEffect-VST2-Info.plist
# IPlugExamples/IPlugEffect/resources/IPlugEffect-VST3-Info.plist
# IPlugExamples/IPlugMonoSynth/IPlugMonoSynth-app.vcxproj.user
# IPlugExamples/IPlugPlush/IPlugPlush-rtas.vcxproj.user
# IPlugExamples/IPlugPolySynth/IPlugPolySynth-rtas.vcxproj.user
# WDL/IPlug/Containers.h
# WDL/IPlug/IGraphics.cpp
# WDL/IPlug/IGraphics.h
# WDL/IPlug/IGraphicsCarbon.cpp
# WDL/IPlug/IGraphicsCocoa.mm
# WDL/IPlug/IGraphicsMac.h
# WDL/IPlug/IGraphicsMac.mm
# WDL/IPlug/IPlugAU.cpp
# WDL/IPlug/IPlugAU.h
# WDL/IPlug/IPlugAU_ViewFactory.mm
# WDL/IPlug/IPlugBase.cpp
# WDL/IPlug/IPlugStructs.h
# WDL/IPlug/IPlugVST3.cpp
# WDL/IPlug/IPlug_include_in_plug_src.h
# WDL/IPlug/Log.cpp
# WDL/IPlug/Log.h
# common.xcconfig
WDL/IPlug/IPlugAU.cpp