memory leak when preloadEffect
Add PVR.CCZ encryption support to ZipUtils based upon http://www.codeandweb.com/texturepacker/contentprotection
Add sample to TestCPP.
issue #2103: Add more lua test case
Promote global functions and variables for PVR decryption to ZipUtils class.
Rename PVR decryption functions and variables to better fit in the Cocos2DX framework.
Improve log error notes.
Update TextureAtlasEncryptionTest to match revised function call in ZipUtils.
Update ccSetPvrEncryptionKeyPart documentation to clarify that encryption is never 100% secure.
Log assert messages

Now, assert messages as visible in the trace output
as well as the line number of condition that failed.
Rename CCScriptSupport::executeAssert -> CCScriptSupport::handleAssert

Also remove the first "cond" argument, since it is always false.
Fixed issue when non-ascii string used in script
Add libjpeg linkage.
Merge remote-tracking branch 'origin/master' into emscriptenate
Add a newline
Fix incorrect colors in CCDrawNode.
Added function ccSetPvrEncryptionKey(…) to set the encryption key in a single function call.
Updated the TextureAtlasEncryptionTest to show how to use the ccSetPvrEncryptionKey(…) function.
Updated the notes and header docs for improved clarity.
Fixing CCScale9Sprites when loaded from CCB files to be able to change color and opacity
Fixing coloring in CCControlButtons by overriding the set/get color functions
Update CCNode.cpp

注释错误
Removing setting ignoreAnchorPoint for child CCB files. Was causing a bug with positioning
Fixing crash while trying to load sprite frame when the file is missing. Reports error instead
Add libwebp linkage (needed for asm.js validation)
Now validates as asm.js: Disable HttpClient, pthread_cond_signal and eglReleaseThread in Emscripten.
Merge pull request #2529 from rohankuruvilla/cocosplayer

fixed #2128: Bug fixes in CCBReader.