4 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
James Chen	e73e2f4387	issue #1683: Updated the name of CocosPlayer project.	2013-01-26 22:35:30 +08:00
Rohan Kuruvilla	43229cb440	Adding CocosPlayerJS for Android	2013-01-24 18:37:24 -08:00