216 Commits

Author	SHA1	Message	Date
Dhilan007	c6344875de	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop	2013-10-16 17:30:51 +08:00
James Chen	b5233fc18d	issue #2905: [iOS Mac] Updating project configurations.	2013-10-16 17:27:30 +08:00
James Chen	225738ecc5	issue #2905: [iOS Mac] HelloLua and TestLua work now.	2013-10-16 17:19:02 +08:00
James Chen	00ee416006	issue #2905: [iOS Mac] All js games work now.	2013-10-16 16:21:55 +08:00
Dhilan007	3d1f734326	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop	2013-10-16 15:44:43 +08:00
James Chen	6fba0dd5db	issue #2905: [iOS Mac] TestJavascript works now.	2013-10-16 15:43:59 +08:00
James Chen	039a2c93e1	issue #2905: [iOS Mac]Removing 'include' folder in 'external' group. Otherwise, it will find wrong included file.	2013-10-16 11:30:56 +08:00
James Chen	65f33461bc	issue #2905: [iOS, Mac] Updating project configuration, TestCpp works now.	2013-10-16 11:19:42 +08:00
Dhilan007	5116e91c4b	Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into di2905	2013-10-16 11:00:22 +08:00
Ricardo Quesada	8cad67a3e1	small fixes for the Xcode projects	2013-10-15 13:36:03 -07:00
Dhilan007	2865ad798b	issues #2905:Updating project configuration for folder change.	2013-10-15 10:18:37 +08:00
James Chen	9f89879e5e	issue #2905: [iOS, Mac] Always search user path.	2013-10-14 17:43:59 +08:00
James Chen	16c88363f5	issue #2905: Updating project configuration for SimpleGame.	2013-10-14 17:16:39 +08:00
James Chen	438fe70287	issue #2905: [iOS, Mac] HelloCpp works now.	2013-10-14 15:53:14 +08:00
minggo	ad6325b0dd	fix conflicts	2013-10-12 11:31:32 +08:00
minggo	4313c46e93	issue #2905:adjust folder structure	2013-10-12 11:22:05 +08:00