samuele3hu ac46932c06 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI ... Conflicts: tools/project-creator/module/cocos_files.json		2014-01-06 20:07:39 +08:00
..
config.gitingore	Fix:Resolve the lua android template errors	2014-01-06 19:59:31 +08:00
create_config.py	add 755	2014-01-06 01:31:36 -05:00