Merge branch 'ti_lab_build' into develop
# Conflicts: # include/ITAAtomicOps.h # include/ITAAtomicPrimitives.h # include/ITAAudioSample.h # include/ITAAudiofileCommon.h # include/ITAAudiofileReader.h # include/ITAAudiofileWriter.h # include/ITABase/UtilsJSON.h # include/ITABaseDefinitions.h # include/ITABlockMath.h # include/ITABufferedAudioFileWriter.h # include/ITAClock.h # include/ITAConfigUtils.h # include/ITAConstants.h # include/ITACriticalSection.h # include/ITADataLog.h # include/ITADebug.h # include/ITAEndianness.h # include/ITAException.h # include/ITAFade.h # include/ITAFastMath.h # include/ITAFileSystemUtils.h # include/ITAFiniteImpulseResponse.h # include/ITAFunctors.h # include/ITAHDFTSpectra.h # include/ITAHDFTSpectrum.h # include/ITAHPT.h # include/ITAISO9613.h # include/ITAInterpolation.h # include/ITALog.h # include/ITAMagnitudeSpectrum.h # include/ITAMultichannelFiniteImpulseResponse.h # include/ITAMutex.h # include/ITANumericUtils.h # include/ITAOps.h # include/ITASampleBuffer.h # include/ITASampleFrame.h # include/ITASampleTypeConversion.h # include/ITASimpleConvolution.h # include/ITASpectrum.h # include/ITAStopWatch.h # include/ITAStringUtils.h # include/ITAThirdOctaveMagnitudeSpectrum.h # include/ITATimeSeriesAnalyzer.h # include/ITATimer.h # include/ITATypes.h # include/ITAUncopyable.h # include/ITAWholeOctaveMagnitudeSpectrum.h # include/ITAWinPCClock.h # tests/ITABaseSampleBufferTest.cpp
Please register or sign in to comment