Commit 62d4d9519ea88ba993f685d4c6071efe21287d06

Authored by Zhao Shuaihua
2 parents 836a7b9c 3d73904f

Merge branch 'dev-shzhao' of 192.168.10.182:ming/vpt_ascend_arm into dev-shzhao

src/decoder/Makefile_face 100644 → 100755