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
fixed potential crash in CCScheduler::removeHashElement

If the scheduler is the last object to have retained the pElements target and
the targets desctructor calls CCScheduler::unschedule() invalid memory is
accessed as pElement->timers is already freed, but the pElement is not removed
yet.
Therefore the call to target->release() should be made after pElement has been
removed from the hash table
fixed potential crash in CCSaxParser

The character array which given to CCSAXParser::parse() may not be NULL
terminated.
Therefore we must also add the size of the data array to the parameter list
of the tinyxml2::XMLDocument::parse() call
* Basic Linux OpenAL support.
* Basic Linux OpenAL support.
Merge branch 'openal' of https://github.com/azmeuk/cocos2d-x into openal

Conflicts:
	CocosDenshion/linux/SimpleAudioEngineOpenAL.cpp
	CocosDenshion/proj.linux/Makefile
add getIsScissorEnable() and getScissorRect() for CCEGLViewProtocal
change method name from getIsScissorEnable() to isScissorEnable()
Fix the display bug when a scrollView nested in another scrollView
* Fixed CocosDenshionTestBug
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into openal
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into openal