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
..
auto-generated@bff05d857c	[AUTO] : updating submodule reference to latest autogenerated bindings	2013-09-17 10:50:55 +00:00
javascript	Keypad event fix for js and lua bindings.	2013-09-17 23:21:45 +08:00
lua	Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into keyboard_test	2013-09-17 23:24:14 +08:00