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

check pointer before using #17215

Merged
merged 1 commit into from
Jan 19, 2017
Merged

Conversation

minggo
Copy link
Contributor

@minggo minggo commented Jan 18, 2017

No description provided.

@minggo minggo merged commit c4d0d56 into cocos2d:v3 Jan 19, 2017
stevetranby added a commit to stevetranby/cocos2d-x that referenced this pull request Jan 25, 2017
…futurePRs

* commit '690db56f44997830e422fd66b8c9aeb8056d16ed':
  Merge v3.14.1 (cocos2d#17231)
  Fix typo in RenderTexture: "Bufffer" -> "Buffer" (cocos2d#17235)
  Fix typos in local variables (cocos2d#17236)
  [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (cocos2d#17232)
  Refactor WebSocket to support SSL (wss) (cocos2d#17172)
  Prevent the compilation of NavMeshTest if CC_USE_PHYSICS=0. (cocos2d#17205)
  Solve the compile error when building platform tizen. (cocos2d#17216)
  Update the reference of submodule cocos2d-console. (cocos2d#17212)
  Fix warnings about implicit conversion loses integer precision (cocos2d#17220)
  Fix misspelling of setFirstFocusedWidget function (cocos2d#17219)
  Fix typo in variable name (cocos2d#17218)
  check pointer before using (cocos2d#17215)

# Conflicts:
#	CHANGELOG
#	build/cocos2d_libs.xcodeproj/project.pbxproj
#	cocos/3d/CCTerrain.cpp
#	cocos/cocos2d.cpp
#	cocos/network/WebSocket.cpp
#	docs/RELEASE_NOTES_CN.md
#	docs/doxygen.config
#	tools/cocos2d-console
@minggo minggo deleted the httpclient-android-crash branch February 4, 2017 10:11
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.

1 participant