Walzer 685b70e6fb fixed #1402, résolve conflicting "create" functions ... 1. Following https://docs.google.com/document/d/1eqvYjVah0R9nkjzJ_ga1-_cyjHnizVQ5dyESYNpYM0s/edit?pli=1 2. use CCSequence/CCSpawn::initWithTwoActions, createWithTwoActions instead of initOneTwo, create(one, two). 3. haven't re-generate lua-binding to resolve the conflicts yet.		2012-07-23 22:49:11 +08:00
..
HelloCpp	Merge branch 'gles20' of https://github.com/walzer/cocos2d-x into modify_xcode_project	2012-07-23 15:38:24 +08:00
HelloLua	fixed #1402, résolve conflicting "create" functions	2012-07-23 22:49:11 +08:00
TestCpp	fixed #1402, résolve conflicting "create" functions	2012-07-23 22:49:11 +08:00
TestJavascript	unify Bundle ID for all xcodeprojects to "org.cocos2d-x.*", add icons for iphone/ipad * retina.	2012-07-23 15:23:26 +08:00