Fixed linebreaks on Mac OSX
Fixed tabbing.
issue #2103 add cocosbuilder lua bind and add a simple sample
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into bind_cocosbuilder
issue #2103 remove  simple cocosbuilder sample
issue #2103 modify some compile setup and delete some deprecated lua function
issue #2103 modify some compile setup
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into bind_cocosbuilder
issue #2103 modify some compile setup and del some resource file
issue #2103 modify some compile setup
issue #2103 modify some compile setup
cc_timeval works on 64bit machines, like OS X
fixed #2224 : Update the JS binding code for plugin.
Merge branch 'ForReflection'

Conflicts:
	plugin/protocols/platform/ios/PluginUtilsIOS.mm
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
Merge pull request #2714 from samuele3hu/bind_cocosbuilder

add cocosbuilder lua_binding
Merge pull request #2624 from benjamesward/master

Fixed linebreaks on Mac OSX
Merge pull request #2735 from natural-law/master

Update the JS binding code for plugin
compiles on linux and other machines without C99 support
fixed #2247: Using functions instead of macros to speeding up building for JSB project.