Merge branch 'jsb-distancesq' of https://github.com/jdmunro/cocos2d-x into jsb-distancesq

Browse Source

Conflicts:
	scripting/javascript/bindings/cocos2d_specifics.cpp

...

This commit is contained in:

jdmunro 2013-07-14 09:56:57 +01:00

parent 43f5b09964 4cd3e2f738

commit 81d03c845f

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available