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
Fixing profiling compile error
Fix linux compilation of CCTexturePVR.cpp

On linux (and possibly other platforms)
GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG is simply not defined since we don't
include GLES/gl2ext.h.
Merge pull request #2243 from sbc100/fix_linux_build

Fix linux compilation of CCTexturePVR.cpp
Fix bug: CCControl's touch priority is not set correctly; m_nDefaultTouchPriority is never used;
- changed cocos2d mac project to support universal build and x86
- fixed issues associated with that
added sample game xcode project for mac
Merge pull request #2252 from billy1380/master

fixed #1856：Adding 64bit target for Mac project.
Update AUTHORS
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
Merge branch 'fix_profiler_compile_error_android' of https://github.com/gelldur/cocos2d-x

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Fixing compilation errors when enable CC_ENABLE_PROFILERS.