Fix typos in docs #17132

merged 1 commit into from Jan 11, 2017


None yet

2 participants

mogemimi commented Jan 9, 2017

Hi, this PR fixes the typos and doxygen mistakes in the docs and comments.

minggo commented Jan 10, 2017

thanks @mogemimi, but could you please fix the conflict?

@mogemimi mogemimi Fix typos in docs

@minggo Thank you for reviewing this. I resolved the conflicts.

minggo commented Jan 11, 2017


@minggo minggo merged commit 1d2b731 into cocos2d:v3 Jan 11, 2017

2 checks passed

Jenkins CI Build successfully!
continuous-integration/travis-ci/pr The Travis CI build passed
@mogemimi mogemimi deleted the mogemimi:fix-docs branch Jan 11, 2017
@stevetranby stevetranby added a commit to stevetranby/cocos2d-x that referenced this pull request Jan 14, 2017
@stevetranby stevetranby Merge commit '59403ad40dcf400c6a83a0020e489cd7383151ab' into scgamex-…

* commit '59403ad40dcf400c6a83a0020e489cd7383151ab': (27 commits)
  Propagate onTouchCancelled (#17174)
  getLetter function for Text (#17178)
  fix child removing from ListView (#17177)
  outline to float (#17176)
  [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17183)
  bind FileUtils:getDataFromFile() to lua (#17182)
  Adding async version of common CCFileUtil functions. This will allow engine users to interact with the file system, without blocking the main thread and disrupting rendering. (#17140)
  Particle set display frame (#17163)
  purge glfw3 before installing glfw3.2 (#17165)
  Fix incorrect function name for calculateBillboardTransform (#17164)
  Correct spelling of function name `getAncestorWidget` (#17158)
  Fix minor typos in function parameters (#17157)
  sprite: doc fixes (#17154)
  use std::stable_sort to keep order (#17156)
  fix dutch language value and add missing languages (#17160)
  [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17152)
  Fix typos in docs (#17132)
  [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17143)
  updated location of openssl dlls (#17133)
  fix crash if physics3d camera is not set (#17139)

# Conflicts:
#	tools/cocos2d-console
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment