resolved merge issues.
authorChitresh Gupta <chitresh.g@pathpartnertech.com>
Tue, 3 Jan 2017 10:44:49 +0000 (16:14 +0530)
committerChitresh Gupta <chitresh.g@pathpartnertech.com>
Tue, 3 Jan 2017 10:44:49 +0000 (16:14 +0530)
commit943c30d847b5e858566d12967f30d9abcf27fe16
treee3de6259a3be7d3aa31605d72ca93b3baafb2422
parent29c7aa660e9c248319a16a38e55559cfb0859c04
resolved merge issues.
pasdk/test_arm/.cproject
pasdk/test_arm/application/app.cfg
pasdk/test_dsp/.cproject
pasdk/test_dsp/application/app.cmd
scripts/build_paf_libs.bat