delete parameter(-o igncr) when running build_native.sh in eclipse project
Merge pull request #2200 from minggo/test-before-release

delete parameter(-o igncr) when running build_native.sh in eclipse project
change Android.Manifest.xml to unix style
fixed #1838: Adding test for the new feature(Timeline callback & playing effect) of CocosBuilder.
Merge pull request #2201 from dumganhar/rohankuruvilla-ccbreader

fixed #1838: Fix bugs of CCBReader and adding test for the new feature(Timeline callback & playing effect) of CocosBuilder.
add c project setting for lua samples
Merge https://github.com/cocos2d/cocos2d-x into test-before-release
Merge pull request #2202 from minggo/test-before-release

add c project setting for lua samples on android
Updating project configuration of TestCpp for Android, Linux, Mac and nacl.
Updating project configuration of TestCpp for win32.
Updating libExtensions.vcxproj.
add customer fonts information in Info.plist
Updating project setting of testcpp for Marmalade.
Merge branch 'master' of https://github.com/dumganhar/cocos2d-x
Merge pull request #2203 from dumganhar/master

Updating project configuration of TestCpp for all platform since CocosBuilderTest/TimelineCallback&Sound has been added.
Merge pull request #2204 from minggo/test-before-release

add customer fonts information in Info.plist
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
Merge pull request #2205 from CocosRobot/updategeneratedsubmodule_1363687504

cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
Fixing compilation errors for win32.
Merge pull request #2206 from dumganhar/master

Fixing compilation errors for win32.