James Chen f403f7d683 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into keyboard_test ... Conflicts: samples/samples.xcodeproj/project.pbxproj		2013-09-17 23:24:14 +08:00
..
TestCpp.vcxproj	Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into keyboard_test	2013-09-17 23:24:14 +08:00
TestCpp.vcxproj.filters	Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into keyboard_test	2013-09-17 23:24:14 +08:00
TestCpp.vcxproj.user	issue #1603: Moved the position of some projects.	2012-12-20 12:58:21 +08:00
main.cpp	1. change 480*320 to 960*640.	2013-09-14 20:52:35 +08:00
main.h	issue #1603: Moved the position of some projects.	2012-12-20 12:58:21 +08:00