3 Commits

Author	SHA1	Message	Date
minggo	58618172e6	merge pull request and fix some conflicts	2013-03-18 16:15:48 +08:00
Rohan Kuruvilla	bb31ea232b	Updating project files for Javascript based sample projects	2013-03-04 11:50:39 -08:00
minggo	f9a9d45f88	issue #1603:adjust samples directory ... Signed-off-by: minggo <ming@cocos2d-x.org>	2012-12-20 14:14:53 +08:00