Merge branch 'mchinensedit'
Merge remote-tracking branch 'upstream/master'
KeyboardDispatcher + tests for it on linux
added vim .swo file
fixed typo that return value was ignored
Merge pull request #1 from cocos2d/develop

Develop
assert for fwrite return value
keyboard support throught compiler directive
TestCpp sample respects keyboard support directive
deleted defines in proj.linux's Makefile
comments fixed
Merge pull request #3 from cocos2d/develop

pull request from main repo
simplified CCKeyboardDispatcher and CCLayer does not inherit from CCKeyboardDelegate
Merge pull request #4 from cocos2d/develop

pull request from main repo
Merge pull request from cocos2d/develop
Merge branch 'develop' of https://github.com/simpliplant/cocos2d-x into simp
set up keyboard handling for mac
Merge pull request #5 from mchinen/simpfix

Merge keyboard support for mac by @mchinen
Merge pull request #2842 from dumganhar/develop

[Android] Don't use c++11 feature in OpenSLEngine.cpp. [iOS] Adding i386 arch for MoonWarriors.
Merge pull request #2844 from dumganhar/develop

Crash fix in CCControlColurPickerTest.