Added CocosDenshion dependency to libextension project
adding ccFPSImages entity as linked resource
unified mac project for all the cocos2d-x libraries
closed #2347: Macros like CC_KEYBOARD_SUPPORT should not be in header file.
[plugin-x][Umeng] fix not sending Event when paramMap is nil
Merge pull request #3034 from Squallium/develop

Added CocosDenshion dependency to libextension project
Update AUTHORS [ci skip]
Merge pull request #3038 from young40/develop

close #2348: [plugin-x][Umeng] fix not sending Event when paramMap is nil
Update AUTHORS [ci skip]
closed #2347: Keyboard is supported from cocos2d-x 3.0.
issue #2347: Compiled ok for android, marmalade and nacl, windows needs to be tested too.
Fixing errors on windows.
Merge branch 'iss2347-keyboard-macro' of https://github.com/dumganhar/cocos2d-x into iss2347-keyboard-macro
close #2347: Updating tools/tojs/cocos2dx.ini.
Merge pull request #3039 from dumganhar/iss2347-keyboard-macro

Macros like CC_KEYBOARD_SUPPORT should not be in header file.
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into unified_mac_project
Removes #if from header class

preventing ugly bugs
cocos2d mac project redesigned
removes unused projects
Tries to compile WaterMelonWithMe