samuele3hu a547d6aa33 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_navigation ... Conflicts: tools/bindings-generator		2015-06-16 11:36:11 +08:00
..
Classes	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_navigation	2015-06-16 11:36:11 +08:00
proj.android	add simulator	2015-05-14 14:11:40 +08:00
proj.ios_mac	Fixed: app crash when console ui trace nil string on mac platform #11211	2015-05-15 15:08:42 +08:00
proj.win32	fix simulator vs2015 support	2015-05-22 17:47:48 +08:00