minggo 1166a02e13 resolve conflict for #2505		2013-05-07 14:31:00 +08:00
..
CCControlExtension	More client side buffer fixes.	2013-05-06 20:59:48 -07:00
CCEditBox	Resize CCEditBox subviews when contentSize changes	2013-04-02 16:34:33 +03:00
CCScrollView	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x	2013-04-30 21:06:18 +05:30