2 Commits

Author	SHA1	Message	Date
liuliang	a27a420a91	Merge branch 'v3' of github.com:super626/cocos2d-x into Meshv3 ... Conflicts: cocos/3d/CCSprite3D.cpp	2014-08-20 11:45:48 +08:00
lvlong	a497cc0ed2	wrong suffix name	2014-06-27 15:53:25 +08:00