Merge branch 'master' into 1.2.1_google

wjc

1 天以前 29e200b8db74d31f49d4d1ac64a41ad44e1b3a90

1
2
3
4
5
<hbuilder debug="false" syncDebug="false" version="1.9.9.80110">
    <apps>
        <app appid="unimp" appver="1.0" />
    </apps>
</hbuilder>