Merge branch 'emscriptenate' of github.com:j4m3z0r/cocos2d-x into emscriptenate

Browse Source

Conflicts:
	Emscripten.TODO
	cocos2dx/proj.emscripten/cocos2dx.mk
	external/chipmunk/proj.emscripten/Makefile
	samples/Cpp/TestCpp/proj.emscripten/Makefile

...

This commit is contained in:

James Gregory 2013-05-01 13:45:15 -07:00

parent 675bf53a4e 13947c4c23

commit 737d51a05b

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