Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Some cosmetics #1730

Merged
merged 2 commits into from Dec 6, 2012
Merged

Some cosmetics #1730

merged 2 commits into from Dec 6, 2012

Conversation

fape
Copy link
Contributor

@fape fape commented Dec 6, 2012

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

dumganhar pushed a commit that referenced this pull request Dec 6, 2012
@dumganhar dumganhar merged commit 6868929 into cocos2d:gles20 Dec 6, 2012
@dumganhar
Copy link

Thanks. :)

@fape fape deleted the cosmetics branch December 26, 2012 08:22
dumganhar pushed a commit to dumganhar/cocos2d-x that referenced this pull request Feb 21, 2013
dumganhar pushed a commit that referenced this pull request Feb 21, 2013
fixed #1730: Exposed CCScrollView and CCTableView to js.
angeltown pushed a commit to angeltown/cocos2d-x that referenced this pull request Apr 28, 2014
angeltown pushed a commit to angeltown/cocos2d-x that referenced this pull request Apr 28, 2014
angeltown pushed a commit to angeltown/cocos2d-x that referenced this pull request Apr 28, 2014
fixed cocos2d#1730: Exposed CCScrollView and CCTableView to js.
angeltown pushed a commit to angeltown/cocos2d-x that referenced this pull request Apr 29, 2014
angeltown pushed a commit to angeltown/cocos2d-x that referenced this pull request Apr 29, 2014
angeltown pushed a commit to angeltown/cocos2d-x that referenced this pull request Apr 29, 2014
fixed cocos2d#1730: Exposed CCScrollView and CCTableView to js.
dumganhar pushed a commit that referenced this pull request May 4, 2014
dumganhar pushed a commit that referenced this pull request May 4, 2014
fixed #1730: Exposed CCScrollView and CCTableView to js.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants