Merge branch 'mchinensedit'
Merge remote-tracking branch 'upstream/master'
Update CCEditBoxImplIOS.mm

https://github.com/sunxiaoyu/cocos2d-x/commit/02c664730669c7e3d5d0ecc727deab9aa785c2c7
correct the library path
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
Update for spine runtime
Update spine runtime
Update Android.mk
Update Makefile

For nacl (spine runtime)
Update Android.mk
Merge pull request #3 from cocos2d/develop

pull request from main repo
simplified CCKeyboardDispatcher and CCLayer does not inherit from CCKeyboardDelegate