5 Commits

Author	SHA1	Message	Date
James Chen	df85ba8fd9	Merge commit 'refs/pull/4545/head' of git://github.com/cocos2d/cocos2d-x into new-spine ... Conflicts: cocos/editor-support/spine/CCSkeleton.h	2013-12-19 21:07:24 +08:00
byeonggee.seo	e673bd80bb	new spine runtime applied	2013-12-19 10:50:37 +09:00
boyu0	af5f496861	issue #3162: Merge Node and NodeRGBA, fix bug: Child's opacity will not be changed when its parent's setCascadeOpacityEnabled was set to true and opacity was changed.	2013-12-06 18:07:16 +08:00
minggo	6fc2be62f5	issue #2905: testcpp bild ok on Android	2013-10-15 18:00:03 +08:00
minggo	4313c46e93	issue #2905:adjust folder structure	2013-10-12 11:22:05 +08:00