Merge branch 'gles20_tmp' of https://github.com/dumganhar/cocos2d-x into gles20_tmp

Browse Source

Conflicts:
	tests/tests/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.cpp
	tests/tests/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.h
	tests/tests/ExtensionsTest/ControlExtensionTest/CCControlScene.cpp
	tests/tests/ExtensionsTest/ControlExtensionTest/CCControlScene.h
	tests/tests/ExtensionsTest/ExtensionsTest.cpp

...

This commit is contained in:

James Chen 2012-04-16 23:21:14 +08:00

parent 044729dab9 ac6e263621

commit f5d640e3a7

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