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)
# Conflicts:
# pasdk/test_dsp/application/itopo/evmk2g/alpha/i13_a.h

1  2 
pasdk/test_dsp/application/itopo/evmk2g/alpha/i13_a.h

index 54b6559bf0182ea9e2e4e1b370d8361d4f4cc911,81f558ff8c64b191d8d4453ec0f48fb818ccc954..42f06f7b0b42196647822d9e4afa295b01bf3364
@@@ -57,12 -57,11 +57,12 @@@ All rights reserved
  #include <ae_a.h>
  #include <ml_a.h>
  #include <src_a.h>
- #include <ddpat_a.h>
- #include <thd_a.h>
- #include <car_a.h>
- #include <oar_a.h>
- #include <bmda_a.h>
//#include <ddpat_a.h>
//#include <thd_a.h>
//#include <car_a.h>
//#include <oar_a.h>
//#include <bmda_a.h>
  //#include <dap_a.h>
 +#include <dtsuhda_a.h>
  #include <dtsuhdb_a.h>
  #endif /* _I13_A_H_ */