Bin Zhang c491b6a5c1 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3		2015-05-25 17:01:29 +08:00
..
Classes	not create Vec as possible for setting position	2014-08-28 11:41:18 +08:00
Resources	Add resources	2014-07-04 17:55:20 +08:00
proj.android	Fixed compiling and linking error of lua tests when using NDK r10 above.	2014-11-27 13:56:15 +08:00
proj.android-studio	Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3	2015-05-25 17:01:29 +08:00
proj.ios	Add Default-667h@2x and Default-737h@3x launch images to support iPhone6 and iPhone6+'s native resolution mode	2014-10-16 15:53:12 +08:00
.cocos-project.json	Add files & configuration for android studio support in console.	2015-05-21 16:34:03 +08:00