Merge branch 'dev_pasdk_frank_dtsx' of ssh://git@bitbucket.itg.ti.com/pasdk/pasdk_sr...
authorSu <qsu@ti.com>
Tue, 18 Jul 2017 14:00:52 +0000 (10:00 -0400)
committerSu <qsu@ti.com>
Tue, 18 Jul 2017 14:00:52 +0000 (10:00 -0400)
commitb00871d382ce7e48e59ff6b072a1dc4f02ce0816
tree7b2a2cc3d3827b9df7e0d2eb8b01ef5553a25c9d
parentd5b70fb29613a94a55fd8157e949dfe78e2915ae
parent28ccfead0a13925bb6fbaacc625a2fff48934558
Merge branch 'dev_pasdk_frank_dtsx' of ssh://git@bitbucket.itg.ti.com/pasdk/pasdk_sr.git into dev_pasdk_qin_dtsx

# Conflicts:
# pasdk/test_dsp/application/itopo/evmk2g/alpha/i13_a.h
pasdk/test_dsp/application/itopo/evmk2g/alpha/i13_a.h