James Chen 1ddb5d51b5 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20		2012-05-29 17:13:21 +08:00
..
testjs.xcodeproj	fixed #1177: modify project setting, because CCStd.h is moved into platform/ios	2012-05-29 16:23:57 +08:00
AppController.h	fixed #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' with four spaces.	2012-05-29 16:21:23 +08:00
AppController.mm	fixed #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' with four spaces.	2012-05-29 16:21:23 +08:00
Prefix.pch	fixed #1258, testjs and spidermonkey-ios is merged. But only test_actions.js works.	2012-05-24 17:48:05 +08:00
RootViewController.h	fixed #1258, testjs and spidermonkey-ios is merged. But only test_actions.js works.	2012-05-24 17:48:05 +08:00
RootViewController.mm	fixed #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' with four spaces.	2012-05-29 16:21:23 +08:00
main.m	fixed #1258, testjs and spidermonkey-ios is merged. But only test_actions.js works.	2012-05-24 17:48:05 +08:00