cocos2d/cocos2d-x — pull request #1730 by fape (2012-12-06 09:44:42+00:00)
Title: Some cosmetics

- merge duplicated line for 'fape' in AUTHORS
- include all resources from Resource dir to SampleGame marmalade project file