9 Commits

Author	SHA1	Message	Date
James Chen	93ecfbbf7e	Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x into nacl-fix	2013-06-08 15:42:41 +08:00
yinkaile	65974f2243	standardize code	2013-06-07 10:52:32 +08:00
James Chen	ed4b9b2bb3	Marmalade projects fix.	2013-06-06 14:26:35 +08:00
chengstory	cfb424a6c9	1. add Component struct.	2013-06-04 17:38:43 +08:00
samuele3hu	338c7c8d67	issue #2103 add more test lua	2013-05-24 11:42:27 +08:00
James Chen	6b4420e7ec	issue #2075: Updating extensions project for linux, native client and marmalade.	2013-04-24 14:37:22 +08:00
James Chen	aa5f7ffb6a	Updating project setting of testcpp for Marmalade.	2013-03-19 17:46:49 +08:00
fape	2f5db30332	add missing defines doc file to marmalade project file	2013-02-06 14:51:10 +01:00
fape	1843d576d8	create cocos2dx-ext marmalade project	2012-11-26 20:14:10 +01:00