Readme with instructions on running the emulator correctly for developing cocos2d-x
update doc
Clearer description of command line options
Merge pull request #2213 from folecr/android_emulator_documentation

Readme with instructions on running the emulator correctly
Merge pull request #2211 from whitegfx/master

fixed #1842: Implementation of kEditBoxInputFlagSensitive setting for CCEditBoxImplIOS.
Update AUTHORS
Fixing compilation errors for linux.
Adding a space for target variable.
Merge pull request #2216 from dumganhar/master

Fixing compilation errors for linux.
fix build error caused by libcurl on android x86
fix a logic error and a memory leak in CCLabelBMFont.
Merge pull request #2218 from dumganhar/bmfont-logic-error

fix a logic error and a memory leak in CCLabelBMFont. This PR could fix wrong display of Score in WatermelonWithMe.
fix of wrong group of TimelineCallbackTest in TestCpp.vcxproj.filters.
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
Merge pull request #2219 from dumganhar/master

fix of wrong group of TimelineCallbackTest in TestCpp.vcxproj.filters.
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
Merge pull request #2220 from CocosRobot/updategeneratedsubmodule_1363760413

cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
Updating CocosPlayer AppDelegate files
Adding support for RotationX and RotationY to CCBReader
Fixing issues with rotationX, rotationY in CCBuilderReader