Merge pull request #2 from cocos2d/master

update cocos2d/cocos2d-x
Merge pull request #3 from cocos2d/master

update cocos2d/cocos2d-x
Merge pull request #4 from cocos2d/master

update cocos2d/cocos2d-x
Merge pull request #5 from cocos2d/master

update cocos2d-x
Merge pull request #6 from cocos2d/master

update cocos2d/cocos2d-x
Add RemoveSelf Action

Add RemoveSelf Action, so we can simple call CCRemoveSelf to remove the
node from parent.
Add RemoveSelf Action
Add CCRemoveSelf Action
Added support for setting integer uniforms
Add ActionRemoveSelf in TestCpp/ActionTest

Add ActionRemoveSelf in TestCpp/ActionTest
issue #1942: Adding LayerTest, first commit.
LUA: print() function should use CCLOG internally.

CCLOG uses __android_log_print internally, this allows lua's print() function
to print to android log output and allows developer to see print output from
LUA using "adb logcat".
Merge pull request #2267 from nickveri/master

Added some missing function for setting integer shader uniforms in CCGLProgram
Update AUTHORS
Updating layerTest.lua.
fixed #1944: The subclass of cc.Sprite,cc.Layer... doesn't need cc.associateWithNative anymore.
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
Merge pull request #2292 from CocosRobot/updategeneratedsubmodule_1364875303

cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
Merge pull request #2289 from DenizPiri/master

print() function in LUA should write to android device log (adb logcat)
Update AUTHORS