52 Commits

Author	SHA1	Message	Date
Dhilan007	d96cc9ecb9	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop	2014-03-12 10:08:57 +08:00
James Chen	b88de91a15	Renames 'samples' folder to 'tests', ouch....	2014-03-11 19:10:34 +08:00