cocos2d/cocos2d-x — pull request #2784 by dumganhar (2013-06-06 06:31:53+00:00)
Title: [master] Some fixes

* Adding libwebsockets license in WebSocket.h/.cpp.
* Log error instead of triggering an assert for shadow and stroke.
* [Mamarlade] Fixing a compilation error in cocos2dx/platform/marmalade
* Fixing a bug that display is wrong when setting setTexture(NULL) for CCSprite
* [Spine] Using getContentSize to make spine-runtime supports the strategy of loading resources in cocos2d-x.
* Removing unreadable print in CCBReaderLoad.lua.
* Removing CODE_SIGN_IDETITY section in prom.pbxproj.
* Marmalade projects fix.