add m_fDeltaTime getter function
add cpp function
Added compatible functions for HTML5 multi resources preloading.
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
Updating cocos2dx.ini(adding CCScheduler to 'abstract_class' section) and adding ScriptingCore::getGlobalObject method.
Merge pull request #2146 from dumganhar/master

Updating cocos2dx.ini(adding CCScheduler to 'abstract_class' section) and adding ScriptingCore::getGlobalObject method.
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
Rename cocos2dx.hpp to jsb_cocos2dx_auto.hpp in AppDelegate.cpp
Fix warning in linux build.

Also, define _DEBUG rather then DEBUG in linux and nacl makefiles
by default, and limit the command line definions that are used
when building Box2D.
Merge pull request #2147 from CocosRobot/updategeneratedsubmodule_1363104181

cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
Merge pull request #2149 from fape/jsb_update

Rename cocos2dx.hpp to jsb_cocos2dx_auto.hpp in AssetsManagerTest and CocosPlayer
Merge pull request #2151 from sbc100/fix_warning

Fix warning in linux build.
Merge pull request #2114 from linshun/master

Added compatible function for multi secene resouces preloading.
Merge pull request #2069 from jxhgzs/cocos2dx_getDeltaTime

add m_fDeltaTime getter function
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
Merge pull request #2152 from CocosRobot/updategeneratedsubmodule_1363147492

cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
made some changes in oKeyFrame
Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	scripting/javascript/bindings/generated