James Chen 56340f9555 Merge branch 'iss1686-synchronize' of https://github.com/minggo/cocos2d-x into iss1686-synchronize ... Conflicts: cocos2dx/proj.ios/cocos2dx.xcodeproj/project.pbxproj		2013-02-28 13:01:45 +08:00
..
CCControlExtension	fixed #1686:finish updating	2013-02-28 11:55:36 +08:00
CCEditBox	issue #1753: Upgrading SpiderMonkey to Firefox19.0, iOS works ok.	2013-02-27 15:16:49 +08:00
CCScrollView	fixed #1754: Wrong offset of the container in CCTableView.	2013-02-27 17:52:50 +08:00