4 Commits

Author	SHA1	Message	Date
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
samuele3hu	f36d4a9236	Fix:Resolve the lua android template errors	2014-01-06 19:59:31 +08:00
user	16bff3da1c	add 755	2014-01-06 01:31:36 -05:00
chuanweizhang	c22cc77c66	add cocos files list configure script	2014-01-03 19:09:13 +08:00