GitHub PushEvent at 2014-08-14 11:45:17
Repository: FCEngine
Actor: nqtwilford
Payload: {"shas":[["295e1d10c99975b74540252ce9945d73280a5a42","e69263fdc62e160fca0adc08a201c8f4a168f34d@sina.com","Merge remote-tracking branch 'origin/master' into wilford_sync\n\nConflicts:\n\tTool/FCEngineEditor/GameViewAgent.cpp","nqtwilford",false],["eeeaf036d125a5bf5ce484d7371468de38f64949","e69263fdc62e160fca0adc08a201c8f4a168f34d@sina.com","sync","nqtwilford",false],["0a6f13ce95cbdb5177aac6dd4d0895b4ac741dc9","e69263fdc62e160fca0adc08a201c8f4a168f34d@sina.com","Merge branch 'wilford_sync' of https://github.com/beyondlwm/FCEngine into wilford_sync","nqtwilford",false],["08976f8aa842f14803989fa1efefcdabee43b509","e69263fdc62e160fca0adc08a201c8f4a168f34d@sina.com","sync (ScrollView)","nqtwilford",false],["e388ea752215b77c2808e7676844116192ae4ed9","e69263fdc62e160fca0adc08a201c8f4a168f34d@sina.com","sync (ScrollView)","nqtwilford",false],["2d644836c671e2d9fc057cbf6965e0665dae1caf","e69263fdc62e160fca0adc08a201c8f4a168f34d@sina.com","ScrollView and GridLayout","nqtwilford",false],["8e5961c94fad1da73ab5c610ad36dab7acdf06e8","e69263fdc62e160fca0adc08a201c8f4a168f34d@sina.com","ScrollView and GridLayout","nqtwilford",false],["f508ee24548e7b26ecdc78d5854823bc1ddffa4c","e69263fdc62e160fca0adc08a201c8f4a168f34d@sina.com","Merge branch 'master' into wilford_sync\n\nConflicts:\n\tbin/EngineLaunch.eds","nqtwilford",false]],"size":8,"ref":"refs/heads/master","head":"f508ee24548e7b26ecdc78d5854823bc1ddffa4c"}