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
Remove tailing newlines from CCLog messaages.

Some CCLog message contained trailing newlines which
made the logs hard to read on many platforms.  The solution
here is to stip trailing newlines on those platforms, and also
to remove the newlines from the existing log messages.
Fix linux library path.

linux libraries were being built to "cocos2dx/lib/linux" rather
than just lib/linux.

Always used absolute path for -rpath linker argument.
Fix linux build

The cocos library uses libpthread and libGL on linux, so we need to link
with them.
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