project.properties
修该scrollview嵌套冲突
Merge branch 'yaoyong'
Merge branch 'master' of github.com:llfdbs/IBS
编辑清单冲突
跳转的通串,跳转的提取