GitHub PushEvent at 2014-07-03 02:58:31
Repository: cocos2d-js
Actor: dingpinglv
Payload: {"shas":[["aa28b15607a2f036ecbdb68678fce1a6e845fc89","e26f282eb013ef92f26333a50e5a0dd80e60dd10@gmail.com","Merge branch 'master' of https://github.com/cocos2d/cocos2d-js","wuzhiming",true],["86c829edad0d18ec5b6595f07e6d9dcbbf2cf58d","e5f75d372d7400ccd8bc202e3bf49892c3e195be@gmail.com","Release #5636: Use plugin.agentManager","pandamicro",true],["13c07a81d2cafa95dbb1b53f7220e9d24b4f07fe","e5f75d372d7400ccd8bc202e3bf49892c3e195be@gmail.com","Release #5636: Fix mistaken setContentSize usage, fall back to setSize","pandamicro",true],["2192c03b9fb9ac40f4b4c7d8c30de360e6fd3391","e5f75d372d7400ccd8bc202e3bf49892c3e195be@gmail.com","Release #5636: update cocos2dx_files.json","pandamicro",true],["bd9c8260557a03e87491108d4747d2f5b5d2b23f","e5f75d372d7400ccd8bc202e3bf49892c3e195be@gmail.com","Release #5636: Fix UI test setContentSize bugs","pandamicro",true],["430daa0eb5d7c1790e02a50bb3c7d35e5a20e057","e26f282eb013ef92f26333a50e5a0dd80e60dd10@gmail.com","add some tips for test-cases","wuzhiming",true],["dad0bbfd9195534467e2de087531b3b338e6e897","e26f282eb013ef92f26333a50e5a0dd80e60dd10@gmail.com","Merge branch 'master' of https://github.com/cocos2d/cocos2d-js","wuzhiming",true],["7bb75ef15ecb043881fe32761d9ff09b8010e2c2","e5f75d372d7400ccd8bc202e3bf49892c3e195be@gmail.com","Release #5636: Fix UI test setContentSize bugs","pandamicro",true],["97fb502b8ab36b1247b80ce16e488ee46ceeaf3e","871f5e302ffbb1a870f7f9b92bc56c28298131b6@cocos2d-x.org","Merge pull request #537 from pandamicro/master\n\nRelease #5636: Fix bugs","dingpinglv",true],["8f4a72c0e699a4877824f3a2ae2aeb680ed52b9c","871f5e302ffbb1a870f7f9b92bc56c28298131b6@cocos2d-x.org","Merge branch 'master' of https://github.com/cocos2d/cocos2d-js into Issue5600_Cocostudio\n\nConflicts:\n\tframeworks/js-bindings/cocos2d-x\n\tsamples/js-tests/src/GUITest/UIListViewTest/UIListViewTest.js\n\tsamples/js-tests/src/GUITest/UIRichTextTest/UIRichTextTest.js","dingpinglv",true],["58145732675f5e1e61e58fcc7601b198a19d8c87","e26f282eb013ef92f26333a50e5a0dd80e60dd10@gmail.com","fixed Conflicts","wuzhiming",true],["50195e8e95b546f2aafcaeda770671ae5deb74ae","e26f282eb013ef92f26333a50e5a0dd80e60dd10@gmail.com","no message","wuzhiming",true],["2d180b06622978be78eafdc7d274a73f648a1054","871f5e302ffbb1a870f7f9b92bc56c28298131b6@cocos2d-x.org","Merge pull request #538 from wuzhiming/master2\n\nadd some tips for facebookTest","dingpinglv",true],["e4e328da342ad94c200836f70db9c9a01def1560","871f5e302ffbb1a870f7f9b92bc56c28298131b6@cocos2d-x.org","Issue #5600: correct some mistakes of UITests","dingpinglv",true],["6eea0c15126fbd358d9c30f1effcfa9151e7d64d","871f5e302ffbb1a870f7f9b92bc56c28298131b6@cocos2d-x.org","Merge branch 'master' of https://github.com/cocos2d/cocos2d-js into Issue5600_Cocostudio","dingpinglv",true]],"size":15,"ref":"refs/heads/Issue5600_Cocostudio","head":"6eea0c15126fbd358d9c30f1effcfa9151e7d64d"}