Merge branch 'dev_pasdk_frank_pasdk376Beta3Release' of ssh://git@bitbucket.itg.ti...
authorSu <qsu@ti.com>
Fri, 25 Aug 2017 20:31:27 +0000 (16:31 -0400)
committerSu <qsu@ti.com>
Fri, 25 Aug 2017 20:31:27 +0000 (16:31 -0400)
commit7a9aa748dae70bf38a4512874c579a8c41d1621a
treeb6a481ef524245cf1008eeed1959587f5eabb060
parent30693500bf0563d283c95182f01be99c7ee561b4
parent4877838a20523591bea9738795a22877c6935a2d
Merge branch 'dev_pasdk_frank_pasdk376Beta3Release' of ssh://git@bitbucket.itg.ti.com/pasdk/pasdk_sr.git into dev_pasdk_qin_dtsx

# Conflicts:
# build_all.bat
# pasdk/common/aspDecOpCircBuf_common.c
# pasdk/common/aspDecOpCircBuf_common.h
# pasdk/paf
# pasdk/test_arm/.ccsproject
# pasdk/test_arm/.cproject
# pasdk/test_arm/.project
# pasdk/test_arm/application/app.cfg
# pasdk/test_arm/application/app.cmd
# pasdk/test_arm/application/app_pkgs.cmd
# pasdk/test_arm/framework/aspDecOpCircBuf_slave.c
# pasdk/test_arm/macros.ini_initial
# pasdk/test_dsp/.ccsproject
# pasdk/test_dsp/.cproject
# pasdk/test_dsp/.project
# pasdk/test_dsp/application/app.cfg
# pasdk/test_dsp/application/app.cmd
# pasdk/test_dsp/application/app_pkgs.cmd
# pasdk/test_dsp/application/itopo/evmk2g/alpha/i13_a.h
# pasdk/test_dsp/framework/aspDecOpCircBuf_master.c
# pasdk/test_dsp/framework/audioStreamInpProc.c
# pasdk/test_dsp/framework/itopo/patchs.c
# pasdk/test_dsp/macros.ini_initial
# scripts/build_dtsxip_pkg.bat
# scripts/build_dtsxip_pkgs.bat
# tools
21 files changed:
pasdk/common/aspDecOpCircBuf_common.c
pasdk/common/aspDecOpCircBuf_common.h
pasdk/paf
pasdk/test_arm/.cproject
pasdk/test_arm/application/app.cfg
pasdk/test_arm/application/app.cmd
pasdk/test_arm/application/app_pkgs.cmd
pasdk/test_arm/framework/aspDecOpCircBuf_slave.c
pasdk/test_arm/framework/audioStreamDecodeProc.c
pasdk/test_arm/macros.ini_initial
pasdk/test_dsp/.cproject
pasdk/test_dsp/application/app.cfg
pasdk/test_dsp/application/app.cmd
pasdk/test_dsp/application/app_pkgs.cmd
pasdk/test_dsp/application/itopo/evmk2g/alpha/i13_a.h
pasdk/test_dsp/application/itopo/evmk2g/atboot.c
pasdk/test_dsp/framework/aspDecOpCircBuf_master.c
pasdk/test_dsp/framework/audioStreamInpProc.c
pasdk/test_dsp/framework/itopo/params.c
pasdk/test_dsp/macros.ini_initial
tools