Merge branch 'Auto_Loading_Fix' into TextSub_Fix
commita7d9004a53fb536fa28dce24c907d4af52c573c6
authorxy <yuzhuohuang@qq.com>
Mon, 28 Nov 2011 13:27:37 +0000 (28 21:27 +0800)
committerxy <yuzhuohuang@qq.com>
Mon, 28 Nov 2011 13:27:37 +0000 (28 21:27 +0800)
tree9521db039917b76f4cb16a34c0a792dc62f224f3
parent2f6166699ebfdfeca69c8c8638a45c1eed64cb42
parent252110b36a4f7f311eab49a4aa2c096cd4315f8d
Merge branch 'Auto_Loading_Fix' into TextSub_Fix