Merge branch 'master' into develop
# Conflicts: # apps/ita_convoi/ita_convoi.cpp # include/ITAConvolutionDefinitions.h # include/ITADirectConvolution.h # include/ITAUPConvolution.h # include/ITAUPFilter.h # include/ITAUPFilterPool.h # include/ITAUPTrigger.h
Please register or sign in to comment