{"push_id":1047015333,"size":2,"distinct_size":2,"ref":"refs/heads/master","head":"29fb273b0dc2631423e879dd51ee9558c987ef49","before":"40f0dfa0ee58fed2d4a2ba74e04d77f125e3f823","commits":[{"sha":"edafea486142c3e80b39b2307038b01f29dbf440","author":{"email":"5fe65224beab912fd9fdbdb0bd47be3b5224d2bb@qq.com","name":"luoshiheng"},"message":"124","distinct":true,"url":"https://api.github.com/repos/niubi5/erhuo/commits/edafea486142c3e80b39b2307038b01f29dbf440"},{"sha":"29fb273b0dc2631423e879dd51ee9558c987ef49","author":{"email":"5fe65224beab912fd9fdbdb0bd47be3b5224d2bb@qq.com","name":"luoshiheng"},"message":"Merge branch 'master' of https://github.com/niubi5/erhuo.git\n\nConflicts:\n\t浜岃揣閾哄瓙1.0/bin/R.txt\n\t浜岃揣閾哄瓙1.0/bin/classes/com/geminno/erhuo/EditUserInfoActivity.class\n\t浜岃揣閾哄瓙1.0/bin/classes/com/geminno/erhuo/GuideActivity.class\n\t浜岃揣閾哄瓙1.0/bin/classes/com/geminno/erhuo/LoginActivity.class\n\t浜岃揣閾哄瓙1.0/bin/classes/com/geminno/erhuo/MainActivity.class\n\t浜岃揣閾哄瓙1.0/bin/classes/com/geminno/erhuo/MyApplication.class\n\t浜岃揣閾哄瓙1.0/bin/classes/com/geminno/erhuo/PublishGoodsActivity$3.class\n\t浜岃揣閾哄瓙1.0/bin/classes/com/geminno/erhuo/PublishGoodsActivity$GridAdapter.class\n\t浜岃揣閾哄瓙1.0/bin/classes/com/geminno/erhuo/R$drawable.class\n\t浜岃揣閾哄瓙1.0/bin/classes/com/geminno/erhuo/R$id.class\n\t浜岃揣閾哄瓙1.0/bin/classes/com/geminno/erhuo/R$layout.class\n\t浜岃揣閾哄瓙1.0/bin/classes/com/geminno/erhuo/R$menu.class\n\t浜岃揣閾哄瓙1.0/bin/classes/com/geminno/erhuo/R$string.class\n\t浜岃揣閾哄瓙1.0/bin/classes/com/geminno/erhuo/R$style.class\n\t浜岃揣閾哄瓙1.0/bin/classes/com/geminno/erhuo/R$styleable.class\n\t浜岃揣閾哄瓙1.0/bin/classes/com/geminno/erhuo/RegisterActivity.class\n\t浜岃揣閾哄瓙1.0/bin/classes/com/geminno/erhuo/ResetActivity.class\n\t浜岃揣閾哄瓙1.0/bin/classes/com/geminno/erhuo/SheZhiActivity.class\n\t浜岃揣閾哄瓙1.0/bin/classes/com/geminno/erhuo/VerifyActivity.class\n\t浜岃揣閾哄瓙1.0/bin/classes/com/geminno/erhuo/WoMenActivity.class\n\t浜岃揣閾哄瓙1.0/bin/classes/com/geminno/erhuo/ZhaoHuiActivity.class\n\t浜岃揣閾哄瓙1.0/bin/classes/com/geminno/erhuo/fragment/DonateFragment.class\n\t浜岃揣閾哄瓙1.0/bin/classes/com/geminno/erhuo/fragment/GuideFragment3.class\n\t浜岃揣閾哄瓙1.0/bin/classes/com/geminno/erhuo/fragment/HomeFragment.class\n\t浜岃揣閾哄瓙1.0/bin/classes/com/geminno/erhuo/fragment/MessageFragment.class\n\t浜岃揣閾哄瓙1.0/bin/classes/com/geminno/erhuo/fragment/UserInfoFragment.class\n\t浜岃揣閾哄瓙1.0/bin/classes/com/geminno/erhuo/view/ImageCycleView$GuidePageChangeListener.class\n\t浜岃揣閾哄瓙1.0/bin/dexedLibs/Cashier_SDK-v4.2.2-19c512ee984b5888b39c9f4510f5c0d3.jar\n\t浜岃揣閾哄瓙1.0/bin/dexedLibs/MobCommons-2016.0303.1229-cc5c86ce51c7d04baf3a29948de92343.jar\n\t浜岃揣閾哄瓙1.0/bin/dexedLibs/MobTools-2016.0303.1229-f2dd72dd82d3250b6797ce3f4a6cdf20.jar\n\t浜岃揣閾哄瓙1.0/bin/dexedLibs/Rong_IMKit_v2_4_9-097291916cda2ba07a15e7bf47123e85.jar\n\t浜岃揣閾哄瓙1.0/bin/dexedLibs/SMSSDK-2.0.2-ca0bf0c539022869c2372c7cbf27d78d.jar\n\t浜岃揣閾哄瓙1.0/bin/dexedLibs/ShareSDK-Core-2.7.0-1aaba2917f281672e65f5c3f49a1c559.jar\n\t浜岃揣閾哄瓙1.0/bin/dexedLibs/ShareSDK-QQ-2.7.0-9c7b516a9d807f2b3687d64e8f873047.jar\n\t浜岃揣閾哄瓙1.0/bin/dexedLibs/ShareSDK-QZone-2.7.0-4dbf842746e7d0111870141360e319a4.jar\n\t浜岃揣閾哄瓙1.0/bin/dexedLibs/ShareSDK-SinaWeibo-2.7.0-4c09d33c4652dd04593563de8a7a7b86.jar\n\t浜岃揣閾哄瓙1.0/bin/dexedLibs/ShareSDK-TencentWeibo-2.7.0-e56c1b24867d9ccf5ce2dcd967b5d138.jar\n\t浜岃揣閾哄瓙1.0/bin/dexedLibs/ShareSDK-Wechat-2.7.0-8a0c7b1b2f0d9c4e3e5a11149da74d2e.jar\n\t浜岃揣閾哄瓙1.0/bin/dexedLibs/ShareSDK-Wechat-Core-2.7.0-07261903282fc020be824802660e4961.jar\n\t浜岃揣閾哄瓙1.0/bin/dexedLibs/ShareSDK-Wechat-Moments-2.7.0-8da29490212c40d8f8c94bfd4a525555.jar\n\t浜岃揣閾哄瓙1.0/bin/dexedLibs/UPPayAssistEx-5e6c8c67a4640a17ca203cf4dcf47b9a.jar\n\t浜岃揣閾哄瓙1.0/bin/dexedLibs/UPPayPluginExPro-b1d3c441572cd03b769b543b6d97b098.jar\n\t浜岃揣閾哄瓙1.0/bin/dexedLibs/alipaySingle-20160111-d3cd28f754369a8cf30b711fc5c0b620.jar\n\t浜岃揣閾哄瓙1.0/bin/dexedLibs/android-support-design-94a6188a6d5982a843600c0acb1a44c8.jar\n\t浜岃揣閾哄瓙1.0/bin/dexedLibs/android-support-v4-e4eddf592f8cb2cb8a13ff980e83cc3b.jar\n\t浜岃揣閾哄瓙1.0/bin/dexedLibs/baidumapapi_base_v3_7_0-1c2d41c1f44733b698c2e43e5c9c0d61.jar\n\t浜岃揣閾哄瓙1.0/bin/dexedLibs/baidumapapi_search_v3_7_0-24c5c8870044147d45651c46dfc7d3ad.jar\n\t浜岃揣閾哄瓙1.0/bin/dexedLibs/baidumapapi_util_v3_7_0-0f4128f3d4441b61ce8f56ae97a7cac9.jar\n\t浜岃揣閾哄瓙1.0/bin/dexedLibs/baiduwalletrefactorlib-802615668fa8f0d40f76796f9f1ae7ba.jar\n\t浜岃揣閾哄瓙1.0/bin/dexedLibs/gradle-wrapper-5519843b6df9f0020670e42bc5904815.jar\n\t浜岃揣閾哄瓙1.0/bin/dexedLibs/gson-2.2.3-8b6408e342de7052aa97f91f0361f1d1.jar\n\t浜岃揣閾哄瓙1.0/bin/dexedLibs/libammsdk-8b1758a9a256c560ba771cd20981081b.jar\n\t浜岃揣閾哄瓙1.0/bin/dexedLibs/libpingpp-2.1.1-2c408d8804fd237a21fc273cdea0a68e.jar\n\t浜岃揣閾哄瓙1.0/bin/dexedLibs/libpingppone-2.1.1-23eb992504a2b03669f35277abfe135d.jar\n\t浜岃揣閾哄瓙1.0/bin/dexedLibs/locSDK_6.13-38c9f924ec55826ac4d4602826a25da8.jar\n\t浜岃揣閾哄瓙1.0/bin/dexedLibs/nineoldandroids-2.4.0-236cd4420ecfb58ed00214acaa0bd71f.jar\n\t浜岃揣閾哄瓙1.0/bin/dexedLibs/okhttp-2.0.0-RC1-4d57f420eb82c5823d6860d8394afcbb.jar\n\t浜岃揣閾哄瓙1.0/bin/dexedLibs/okio-1.0.0-a5bfcf31230a090083d36ce82206fa11.jar\n\t浜岃揣閾哄瓙1.0/bin/dexedLibs/pingpp-de5a32d90a811a8768c2264fc8ca1c52.jar\n\t浜岃揣閾哄瓙1.0/bin/dexedLibs/pingpp-one-436a6e85a19dcc11df7c4cddf5658d49.jar\n\t浜岃揣閾哄瓙1.0/bin/dexedLibs/rongimkit-7fdd6e47561a93c30ac8e64487f23e96.jar\n\t浜岃揣閾哄瓙1.0/bin/dexedLibs/shortmessagesdkgui-ff6cbe3f988e06f74189a59b9c751f17.jar\n\t浜岃揣閾哄瓙1.0/bin/dexedLibs/smssdk-03d325843ae1992571778c58ac95d150.jar\n\t浜岃揣閾哄瓙1.0/bin/dexedLibs/universal-image-loader-1.9.2-SNAPSHOT-with-sources-d39fc75fc3f68965c2a5a4a87a27c603.jar\n\t浜岃揣閾哄瓙1.0/bin/dexedLibs/xUtils-2.6.14-5cf2f8e5baf14d3d0c207576e3bf2c4d.jar\n\t浜岃揣閾哄瓙1.0/bin/res/crunch/drawable-hdpi/input_bar_bg_active.9.png\n\t浜岃揣閾哄瓙1.0/bin/res/crunch/drawable-hdpi/input_bar_bg_normal.9.png\n\t浜岃揣閾哄瓙1.0/bin/res/crunch/drawable-hdpi/market_bao.9.png\n\t浜岃揣閾哄瓙1.0/bin/res/crunch/drawable-hdpi/plugin_camera_choosed.9.png\n\t浜岃揣閾哄瓙1.0/bin/res/crunch/drawable-hdpi/round_box.9.png\n\t浜岃揣閾哄瓙1.0/bin/res/crunch/drawable-hdpi/seabar_input.9.png\n\t浜岃揣閾哄瓙1.0/gen/com/geminno/erhuo/R.java\n\t浜岃揣閾哄瓙1.0/res/layout/activity_comment.xml\n\t浜岃揣閾哄瓙1.0/src/com/geminno/erhuo/CommentActivity.java","distinct":true,"url":"https://api.github.com/repos/niubi5/erhuo/commits/29fb273b0dc2631423e879dd51ee9558c987ef49"}]}