Merge branch 'dev_pasdk_pp_pasdk302' of ssh://git@bitbucket.itg.ti.com/pasdk/pasdk_sr...
authorSu <qsu@ti.com>
Mon, 19 Jun 2017 20:47:49 +0000 (16:47 -0400)
committerSu <qsu@ti.com>
Mon, 19 Jun 2017 20:47:49 +0000 (16:47 -0400)
commit3b5eef4db270cfa2710d8c974d1a21d57e6a2262
treeed2707702dbd6e5618610f7ece5c7117623126a7
parent6b938e1bd72e6822e120043a152cf3ae5b3e4f29
parent8fa9bcaf8003e7724d3dd05552510f3504904b92
Merge branch 'dev_pasdk_pp_pasdk302' of ssh://git@bitbucket.itg.ti.com/pasdk/pasdk_sr.git into dev_pasdk_qin_dtsx

# Conflicts:
# .gitmodules
# 3p-ip-dts
# pasdk/common/aspDecOpCircBuf_common.h
# pasdk/paf
# pasdk/test_arm/.cproject
# pasdk/test_arm/.project
# pasdk/test_arm/application/app.cfg
# pasdk/test_arm/application/app.cmd
# pasdk/test_arm/framework/audioStreamDecodeProc.c
# pasdk/test_arm/macros.ini_initial
# pasdk/test_dsp/.cproject
# pasdk/test_dsp/.project
# pasdk/test_dsp/application/app.cfg
# pasdk/test_dsp/application/app.cmd
# pasdk/test_dsp/application/itopo/evmk2g/alpha/i13_a.h
# pasdk/test_dsp/application/itopo/evmk2g/atboot.c
# pasdk/test_dsp/framework/audioStreamInpProc.c
# pasdk/test_dsp/framework/itopo/patchs.c
# pasdk/test_dsp/framework/systemInit.c
# pasdk/test_dsp/macros.ini_initial
# pasdk/test_dsp/mib/mib.c
# pasdk/test_dsp/sap/audio_dc_cfg.c
# pasdk/test_dsp/sap/sap.c
# pasdk/test_dsp/sap/sap_d10.c
# psdk_cust/pdk_k2g_1_0_1_0_eng/packages/ti/platform/evmk2g/platform_lib/src/platform_audio.c
# readme_code_install_and_build.txt
# tools
# tools/alpha/i13_a.h
# tools/alpha/pa_i13_evmk2g_io_a.h
# tools/alpha/stdbeta.h
19 files changed:
3p-ip-dts
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/framework/aspDecOpCircBuf_slave.c
pasdk/test_arm/framework/audioStreamDecodeProc.c
pasdk/test_arm/framework/itopo/params.c
pasdk/test_arm/framework/systemInit.c
pasdk/test_dsp/application/app.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/framework/itopo/patchs.c
tools