Merge branch 'newcode' into transition

This commit is contained in:
yangxiao 2014-09-02 10:45:46 +08:00
commit aab78c898e
1 changed files with 1 additions and 1 deletions

@ -1 +1 @@
Subproject commit fb44ec8cf77f6f51503987c3a1a0964580b5d88f
Subproject commit 305f090f260a0b8766c3fd09a3d4d2072910bfd9